Mercurial > hg > Members > kono > nitros9-code

annotate makefile @ 2813:b8445469ab90 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to cls command in the dladd utils.
author David Ladd <drencor-xeen@users.sf.net>
date Tue, 12 Feb 2013 12:51:35 -0600
parents 1868fbf470e7
children c1892376e7a7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1363
53c50c807d55 Major move to new NitrOS-9 project
boisy
parents: 1133
diff changeset
1 include rules.mak
0
6641a883d6b0 Initial revision
boisy
parents:
diff changeset
2
2774
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
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
6641a883d6b0 Initial revision
boisy
parents:
diff changeset
5 # Make all components
6641a883d6b0 Initial revision
boisy
parents:
diff changeset
6 all:
1363
53c50c807d55 Major move to new NitrOS-9 project
boisy
parents: 1133
diff changeset
7 @$(ECHO) "**************************************************"
53c50c807d55 Major move to new NitrOS-9 project
boisy
parents: 1133
diff changeset
8 @$(ECHO) "* *"
53c50c807d55 Major move to new NitrOS-9 project
boisy
parents: 1133
diff changeset
9 @$(ECHO) "* THE NITROS-9 PROJECT *"
53c50c807d55 Major move to new NitrOS-9 project
boisy
parents: 1133
diff changeset
10 @$(ECHO) "* *"
53c50c807d55 Major move to new NitrOS-9 project
boisy
parents: 1133
diff changeset
11 @$(ECHO) "**************************************************"
1133
4bddc63a59fc More slight Makefile improvements
boisy
parents: 1119
diff changeset
12 $(foreach dir, $(dirs), ($(CD) $(dir); make);)
0
6641a883d6b0 Initial revision
boisy
parents:
diff changeset
13
6641a883d6b0 Initial revision
boisy
parents:
diff changeset
14 # Clean all components
2224
22b75f9788a5 Removed redundant targets
boisy
parents: 2220
diff changeset
15 clean:
2774
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
16 -$(RM) nitros9project.zip $(DSKDIR)/*.dsk $(DSKDIR)/ReadMe $(DSKDIR)/index.shtml
1133
4bddc63a59fc More slight Makefile improvements
boisy
parents: 1119
diff changeset
17 $(foreach dir, $(dirs), ($(CD) $(dir); make clean);)
2774
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
18 $(RM) $(DSKDIR)/ReadMe
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
19 $(RM) $(DSKDIR)/index.html
0
6641a883d6b0 Initial revision
boisy
parents:
diff changeset
20
2200
c4ef83e093f8 Updated the top level makefile to do nightly builds
boisy
parents: 2199
diff changeset
21 # Do CVS update
2606
23bfa8f52dd3 Updated makefile for Mercurial
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2568
diff changeset
22 hgupdate:
2616
b9e8bb5a3796 Added pull
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2606
diff changeset
23 hg pull
2606
23bfa8f52dd3 Updated makefile for Mercurial
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2568
diff changeset
24 hg update
2200
c4ef83e093f8 Updated the top level makefile to do nightly builds
boisy
parents: 2199
diff changeset
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
1133
4bddc63a59fc More slight Makefile improvements
boisy
parents: 1119
diff changeset
28 $(foreach dir, $(dirs), ($(CD) $(dir); make dsk);)
332
5a5ada60704b Minor changes
boisy
parents: 0
diff changeset
29
2227
b9fd9c10af89 clean now comes before update
boisy
parents: 2224
diff changeset
30 # Copy DSK images
2199
eab970e382e2 Prep for nightly builds
boisy
parents: 2191
diff changeset
31 dskcopy: all
eab970e382e2 Prep for nightly builds
boisy
parents: 2191
diff changeset
32 $(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
2512
3dcda506604b added pretty indexer to dskcopy process
aaronwolfe
parents: 2382
diff changeset
33 $(MKDSKINDEX) $(DSKDIR) > $(DSKDIR)/index.html
3dcda506604b added pretty indexer to dskcopy process
aaronwolfe
parents: 2382
diff changeset
34
2199
eab970e382e2 Prep for nightly builds
boisy
parents: 2191
diff changeset
35
458
aac20055f8ad Changes for shellplus source provided by Curtis Boyle
boisy
parents: 378
diff changeset
36 # Clean DSK images
aac20055f8ad Changes for shellplus source provided by Curtis Boyle
boisy
parents: 378
diff changeset
37 dskclean:
1133
4bddc63a59fc More slight Makefile improvements
boisy
parents: 1119
diff changeset
38 $(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
2190
7887b4e72100 Added target for NitrOS-9 DriveWire
boisy
parents: 2067
diff changeset
39
2724
05b648103e78 Renamed dw3.sb to dwio.sb and rbdw3 to rbdw
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2616
diff changeset
40 # DriveWire DSK images
05b648103e78 Renamed dw3.sb to dwio.sb and rbdw3 to rbdw
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2616
diff changeset
41 dwdsk = $(LEVEL1)/coco/nos96809l1coco1_dw.dsk $(LEVEL1)/coco/nos96809l1coco2_dw.dsk \
05b648103e78 Renamed dw3.sb to dwio.sb and rbdw3 to rbdw
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2616
diff changeset
42 $(LEVEL2)/coco3/nos96809l2_dw.dsk $(LEVEL2)/coco3_6309/nos96309l2_dw.dsk
2191
d280490500a8 dw3 target added to makefile
boisy
parents: 2190
diff changeset
43
2774
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
44 dw: dsk
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
45 $(ARCHIVE) nitros9_drivewire3.zip $(dwdsk)
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
46
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
47 # DriveWire Becker DSK Images
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
48 beckerdsk = $(LEVEL1)/coco/nos96809l1coco_becker.dsk \
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
49 $(LEVEL2)/coco3/nos96809l2_becker.dsk $(LEVEL2)/coco3_6309/nos96309l2_becker.dsk
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
50
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
51 becker: dsk
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
52 $(ARCHIVE) nitros9_becker.zip $(beckerdsk)
2199
eab970e382e2 Prep for nightly builds
boisy
parents: 2191
diff changeset
53
2216
d096a278e068 Added info targets
boisy
parents: 2214
diff changeset
54 info:
d096a278e068 Added info targets
boisy
parents: 2214
diff changeset
55 @$(foreach dir, $(dirs), ($(CD) $(dir); make info);)
d096a278e068 Added info targets
boisy
parents: 2214
diff changeset
56
2774
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
57 # This section is to do the nightly build and upload
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
58 # to sourceforge.net you must set the environment
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
59 # variable SOURCEUSER to the userid you have for sourceforge.net
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
60 # The "burst" script is found in the scripts folder and must
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
61 # on your ssh account at sourceforge.net
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
62 ifdef SOURCEUSER
2606
23bfa8f52dd3 Updated makefile for Mercurial
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2568
diff changeset
63 nightly: clean hgupdate dskcopy
2774
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
64 make info>$(DSKDIR)/ReadMe
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
65 $(ARCHIVE) nitros9project $(DSKDIR)/*
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
66 scp nitros9project.zip $(SOURCEUSER),nitros9@web.sourceforge.net:/home/groups/n/ni/nitros9/htdocs
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
67 ssh $(SOURCEUSER),nitros9@shell.sourceforge.net create
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
68 ssh $(SOURCEUSER),nitros9@shell.sourceforge.net "./burst"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
69 else
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
70 nightly:
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
71 @echo ""
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
72 @echo ""
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
73 @echo "You need to set the SOURCEUSER variable"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
74 @echo "You may wish to refer to the nightly"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
75 @echo "section of the makefile."
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
76 endif
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
77
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
78 # This section is to run a nightly test.
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
79 # This requires you to setup a environment variable
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
80 # called TESTSSHSERVER.
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
81 # example would be: TESTSSHSERVER='testuser@localhost'
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
82 # another example: TESTSSHSERVER='testuser@test.testhost.com'
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
83 #
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
84 # You are also required to setup a target path for your file
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
85 # and the environment variable that is being used in this
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
86 # section is called TESTSSHDIR
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
87 ifdef TESTSSHSERVER
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
88 ifdef TESTSSHDIR
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
89 nightlytest: clean hgupdate dskcopy
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
90 make info>$(DSKDIR)/ReadMe
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
91 $(ARCHIVE) nitros9project $(DSKDIR)/*
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
92 scp nitros9project.zip $(TESTSSHSERVER):$(TESTSSHDIR)
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
93 ssh $(TESTSSHSERVER) "./burst"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
94 else
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
95 nightlytest:
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
96 @echo ""
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
97 @echo ""
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
98 @echo "You need to set the TESTSSHDIR variable"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
99 @echo "You may wish to refer to the nightlytest"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
100 @echo "section of the makefile to see what"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
101 @echo "needs to be setup first before using"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
102 @echo "this option"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
103 endif
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
104 else
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
105 nightlytest:
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
106 @echo ""
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
107 @echo ""
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
108 @echo "You need to set the TESTSSHSERVER variable"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
109 @echo "You may wish to refer to the nightlytest"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
110 @echo "section of the makefile to see what"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
111 @echo "needs to be setup first before using"
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
112 @echo "this option."
1868fbf470e7 Merged lwtools-port (2773:ce3dba57003b) and mainline (2772:0a3f4d8ea6d5)
Boisy Pitre <boisy.pitre@nuance.com>
parents: 2724
diff changeset
113 endif