Mercurial > hg > Members > kono > nitros9-code
annotate makefile @ 2898:28ed72477814 lwtools-port
Dummy merge of default branch into lwtools
hg -y merge --tool=internal:fail default
hg revert --all --no-backup --rev .
hg resolve -a -m
This dummy merge discards any changes from the default branch
so that the result is the same as what lwtools already had.
When merging back to default branch later, the discarded
changes will be discarded there also, so the result
will be that the default branch will contain what
the lwtools branch had before these merges.
Only scripts/burst was "rescued" from default branch.
author | Tormod Volden <debian.tormod@gmail.com> |
---|---|
date | Sat, 11 Jan 2014 18:40:44 +0100 |
parents | bd286ab169c7 1addfd8c9d5f |
children | d76362b779c0 |
rev | line source |
---|---|
2890
1addfd8c9d5f
Revert e4a0f58a5f9b (set NITROS9DIR in makefiles)
Tormod Volden <debian.tormod@gmail.com>
parents:
2868
diff
changeset
|
1 include rules.mak |
0 | 2 |
2743
b44abaa5da88
Found that the lib folder was not being processed. Corrected issue.
drencor-xeen
parents:
2737
diff
changeset
|
3 dirs = $(NOSLIB) $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY) |
1119
f86ef3d1d7c9
Makefiles have been redone to take advantage of size and Make features
boisy
parents:
504
diff
changeset
|
4 |
0 | 5 # Make all components |
6 all: | |
1363 | 7 @$(ECHO) "**************************************************" |
8 @$(ECHO) "* *" | |
9 @$(ECHO) "* THE NITROS-9 PROJECT *" | |
10 @$(ECHO) "* *" | |
11 @$(ECHO) "**************************************************" | |
2859
3a3cbc11ea9d
Make build fail if first level subdirectory fails
Tormod Volden <debian.tormod@gmail.com>
parents:
2836
diff
changeset
|
12 $(foreach dir,$(dirs),$(MAKE) -C $(dir) &&) : |
0 | 13 |
14 # Clean all components | |
2224 | 15 clean: |
2835
c1892376e7a7
Makefiles: Do not let $(RM) silently fail
Tormod Volden <debian.tormod@gmail.com>
parents:
2774
diff
changeset
|
16 $(RM) nitros9project.zip $(DSKDIR)/*.dsk $(DSKDIR)/ReadMe $(DSKDIR)/index.shtml |
2859
3a3cbc11ea9d
Make build fail if first level subdirectory fails
Tormod Volden <debian.tormod@gmail.com>
parents:
2836
diff
changeset
|
17 $(foreach dir,$(dirs),$(MAKE) -C $(dir) clean &&) : |
2749
7f7274884574
Updated makefile(s) for spacequest1, spacequest2, subsim, mm, multivue, and rof so that becker disks, for use in DriveWire4 server, are created.
drencor-xeen
parents:
2743
diff
changeset
|
18 $(RM) $(DSKDIR)/ReadMe |
7f7274884574
Updated makefile(s) for spacequest1, spacequest2, subsim, mm, multivue, and rof so that becker disks, for use in DriveWire4 server, are created.
drencor-xeen
parents:
2743
diff
changeset
|
19 $(RM) $(DSKDIR)/index.html |
0 | 20 |
2200 | 21 # Do CVS update |
2606
23bfa8f52dd3
Updated makefile for Mercurial
Boisy Pitre <boisy.pitre@nuance.com>
parents:
2568
diff
changeset
|
22 hgupdate: |
2616 | 23 hg pull |
2606
23bfa8f52dd3
Updated makefile for Mercurial
Boisy Pitre <boisy.pitre@nuance.com>
parents:
2568
diff
changeset
|
24 hg update |
2200 | 25 |
458
aac20055f8ad
Changes for shellplus source provided by Curtis Boyle
boisy
parents:
378
diff
changeset
|
26 # Make DSK images |
1119
f86ef3d1d7c9
Makefiles have been redone to take advantage of size and Make features
boisy
parents:
504
diff
changeset
|
27 dsk: all |
2859
3a3cbc11ea9d
Make build fail if first level subdirectory fails
Tormod Volden <debian.tormod@gmail.com>
parents:
2836
diff
changeset
|
28 $(foreach dir,$(dirs),$(MAKE) -C $(dir) dsk &&) : |
332 | 29 |
2227 | 30 # Copy DSK images |
2199 | 31 dskcopy: all |
2836
7f24db5fd761
Create $(DSKDIR) if needed when running make dskcopy
Tormod Volden <debian.tormod@gmail.com>
parents:
2835
diff
changeset
|
32 mkdir -p $(DSKDIR) |
2859
3a3cbc11ea9d
Make build fail if first level subdirectory fails
Tormod Volden <debian.tormod@gmail.com>
parents:
2836
diff
changeset
|
33 $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskcopy &&) : |
2512 | 34 $(MKDSKINDEX) $(DSKDIR) > $(DSKDIR)/index.html |
35 | |
2199 | 36 |
458
aac20055f8ad
Changes for shellplus source provided by Curtis Boyle
boisy
parents:
378
diff
changeset
|
37 # Clean DSK images |
aac20055f8ad
Changes for shellplus source provided by Curtis Boyle
boisy
parents:
378
diff
changeset
|
38 dskclean: |
2859
3a3cbc11ea9d
Make build fail if first level subdirectory fails
Tormod Volden <debian.tormod@gmail.com>
parents:
2836
diff
changeset
|
39 $(foreach dir,$(dirs),$(MAKE) -C $(dir) dskclean &&) : |
2190 | 40 |
2724
05b648103e78
Renamed dw3.sb to dwio.sb and rbdw3 to rbdw
Boisy Pitre <boisy.pitre@nuance.com>
parents:
2616
diff
changeset
|
41 # DriveWire DSK images |
2868
cfa46960b6bd
makefiles: Rename DW3 to DW all over
Tormod Volden <debian.tormod@gmail.com>
parents:
2764
diff
changeset
|
42 dwdsk = $(LEVEL1)/coco/nos96809l1coco1_dw.dsk $(LEVEL1)/coco/nos96809l1coco2_dw.dsk \ |
cfa46960b6bd
makefiles: Rename DW3 to DW all over
Tormod Volden <debian.tormod@gmail.com>
parents:
2764
diff
changeset
|
43 $(LEVEL2)/coco3/nos96809l2_dw.dsk $(LEVEL2)/coco3_6309/nos96309l2_dw.dsk |
2191 | 44 |
2868
cfa46960b6bd
makefiles: Rename DW3 to DW all over
Tormod Volden <debian.tormod@gmail.com>
parents:
2764
diff
changeset
|
45 dw: dsk |
cfa46960b6bd
makefiles: Rename DW3 to DW all over
Tormod Volden <debian.tormod@gmail.com>
parents:
2764
diff
changeset
|
46 $(ARCHIVE) nitros9_drivewire3.zip $(dwdsk) |
2764
2af3df45f157
Updated main makefile so that when "dw3" and "becker" are activated they call the dependency "dsk".
drencor-xeen
parents:
2763
diff
changeset
|
47 |
2774
1868fbf470e7
Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents:
2724
diff
changeset
|
48 # DriveWire Becker DSK Images |
2757
8888cd0cac1a
Added becker archive creation to the main makefile. The command is "make becker".
drencor-xeen
parents:
2749
diff
changeset
|
49 beckerdsk = $(LEVEL1)/coco/nos96809l1coco_becker.dsk \ |
8888cd0cac1a
Added becker archive creation to the main makefile. The command is "make becker".
drencor-xeen
parents:
2749
diff
changeset
|
50 $(LEVEL2)/coco3/nos96809l2_becker.dsk $(LEVEL2)/coco3_6309/nos96309l2_becker.dsk |
8888cd0cac1a
Added becker archive creation to the main makefile. The command is "make becker".
drencor-xeen
parents:
2749
diff
changeset
|
51 |
2764
2af3df45f157
Updated main makefile so that when "dw3" and "becker" are activated they call the dependency "dsk".
drencor-xeen
parents:
2763
diff
changeset
|
52 becker: dsk |
2757
8888cd0cac1a
Added becker archive creation to the main makefile. The command is "make becker".
drencor-xeen
parents:
2749
diff
changeset
|
53 $(ARCHIVE) nitros9_becker.zip $(beckerdsk) |
8888cd0cac1a
Added becker archive creation to the main makefile. The command is "make becker".
drencor-xeen
parents:
2749
diff
changeset
|
54 |
2216 | 55 info: |
2861
bd286ab169c7
Makefiles: Make make info prettier for dsks/ReadMe
Tormod Volden <debian.tormod@gmail.com>
parents:
2859
diff
changeset
|
56 @$(foreach dir,$(dirs), $(MAKE) --no-print-directory -C $(dir) info &&) : |
2216 | 57 |
2763
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
58 # This section is to do the nightly build and upload |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
59 # to sourceforge.net you must set the environment |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
60 # variable SOURCEUSER to the userid you have for sourceforge.net |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
61 # The "burst" script is found in the scripts folder and must |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
62 # on your ssh account at sourceforge.net |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
63 ifdef SOURCEUSER |
2606
23bfa8f52dd3
Updated makefile for Mercurial
Boisy Pitre <boisy.pitre@nuance.com>
parents:
2568
diff
changeset
|
64 nightly: clean hgupdate dskcopy |
2859
3a3cbc11ea9d
Make build fail if first level subdirectory fails
Tormod Volden <debian.tormod@gmail.com>
parents:
2836
diff
changeset
|
65 $(MAKE) info > $(DSKDIR)/ReadMe |
2749
7f7274884574
Updated makefile(s) for spacequest1, spacequest2, subsim, mm, multivue, and rof so that becker disks, for use in DriveWire4 server, are created.
drencor-xeen
parents:
2743
diff
changeset
|
66 $(ARCHIVE) nitros9project $(DSKDIR)/* |
2737
17cf591458c4
Changed the nightly build section to user a environment variable for the user name when connecting to sourceforge.
drencor-xeen
parents:
2731
diff
changeset
|
67 scp nitros9project.zip $(SOURCEUSER),nitros9@web.sourceforge.net:/home/groups/n/ni/nitros9/htdocs |
17cf591458c4
Changed the nightly build section to user a environment variable for the user name when connecting to sourceforge.
drencor-xeen
parents:
2731
diff
changeset
|
68 ssh $(SOURCEUSER),nitros9@shell.sourceforge.net create |
17cf591458c4
Changed the nightly build section to user a environment variable for the user name when connecting to sourceforge.
drencor-xeen
parents:
2731
diff
changeset
|
69 ssh $(SOURCEUSER),nitros9@shell.sourceforge.net "./burst" |
2763
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
70 else |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
71 nightly: |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
72 @echo "" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
73 @echo "" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
74 @echo "You need to set the SOURCEUSER variable" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
75 @echo "You may wish to refer to the nightly" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
76 @echo "section of the makefile." |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
77 endif |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
78 |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
79 # This section is to run a nightly test. |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
80 # This requires you to setup a environment variable |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
81 # called TESTSSHSERVER. |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
82 # example would be: TESTSSHSERVER='testuser@localhost' |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
83 # another example: TESTSSHSERVER='testuser@test.testhost.com' |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
84 # |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
85 # You are also required to setup a target path for your file |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
86 # and the environment variable that is being used in this |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
87 # section is called TESTSSHDIR |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
88 ifdef TESTSSHSERVER |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
89 ifdef TESTSSHDIR |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
90 nightlytest: clean hgupdate dskcopy |
2859
3a3cbc11ea9d
Make build fail if first level subdirectory fails
Tormod Volden <debian.tormod@gmail.com>
parents:
2836
diff
changeset
|
91 $(MAKE) info > $(DSKDIR)/ReadMe |
2763
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
92 $(ARCHIVE) nitros9project $(DSKDIR)/* |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
93 scp nitros9project.zip $(TESTSSHSERVER):$(TESTSSHDIR) |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
94 ssh $(TESTSSHSERVER) "./burst" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
95 else |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
96 nightlytest: |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
97 @echo "" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
98 @echo "" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
99 @echo "You need to set the TESTSSHDIR variable" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
100 @echo "You may wish to refer to the nightlytest" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
101 @echo "section of the makefile to see what" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
102 @echo "needs to be setup first before using" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
103 @echo "this option" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
104 endif |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
105 else |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
106 nightlytest: |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
107 @echo "" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
108 @echo "" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
109 @echo "You need to set the TESTSSHSERVER variable" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
110 @echo "You may wish to refer to the nightlytest" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
111 @echo "section of the makefile to see what" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
112 @echo "needs to be setup first before using" |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
113 @echo "this option." |
c03464c24b14
Fixed a minor typo in the arcadepak's makefile related to DriveWire3 and Becker.
drencor-xeen
parents:
2758
diff
changeset
|
114 endif |