diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-08 19:43:29 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-08 19:43:29 -0600 |
| commit | f0e5895d5baa04826d1884fc4720c6180f2eda04 (patch) | |
| tree | d839e9131057f9d1271ec2578d1b370dcb89e032 /solenv/inc | |
| parent | 7572bcf0b17da4b37bf4ba834347196567ec3c37 (diff) | |
| parent | 853a58836446858b75bf82916272e9fd27a7a892 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (500 commits)
masterfix DEV300: #i10000# remove hard dep
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i100000# dep. fix
masterfix DEV300: #i10000# removed one hard dep
masterfix DEV300: #i10000# fixed patch handling
masterfix DEV300: #i10000# new configure
DEV300
masterfix DEV300: #i10000# nawk -> awk
l10nmove: adjust repository handling
l10nmove: fixed regex
l10nmove: minor fixes
l10nmove: add l10n repo to gb_REPOS
DEV300 masterfix: gnumake3: subsequenttests requires in environment
ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
DEV300 masterfix: #i10000#: windows: more bizare hacks ...
locales34: have a matching configure as well
DEV300
locales34: back out change from autoreconf
gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
...
Conflicts:
configure
configure.in
instsetoo_native/prj/build.lst
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
instsetoo_native/util/pack.lst
ooo.lst
scp2/source/canvas/canvascommons.scp
scp2/source/canvas/mtfrenderer.scp
scp2/source/ooo/common_brand.scp
scp2/source/ooo/directory_ooo.scp
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/file_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
scp2/source/ooo/module_langpack.ulf
scp2/source/ooo/ure.scp
scp2/source/python/file_python.scp
scp2/source/sdkoo/sdkoo.scp
scp2/source/templates/module_langpack_accessories_templates.sct
scp2/source/templates/module_langpack_accessories_templates_root.sct
set_soenv.in
soldep/bootstrp/appdef.cxx
soldep/bootstrp/dep.cxx
soldep/bootstrp/hashtbl.cxx
soldep/bootstrp/makefile.mk
soldep/bootstrp/minormk.cxx
soldep/bootstrp/prj.cxx
soldep/bootstrp/prodmap.cxx
soldep/inc/dep.hxx
soldep/inc/minormk.hxx
soldep/inc/prodmap.hxx
soldep/inc/soldep/appdef.hxx
soldep/inc/soldep/connctr.hxx
soldep/inc/soldep/depper.hxx
soldep/inc/soldep/depwin.hxx
soldep/inc/soldep/hashtbl.hxx
soldep/inc/soldep/objwin.hxx
soldep/inc/soldep/prj.hxx
soldep/inc/soldep/sdtresid.hxx
soldep/inc/soldep/soldep.hxx
soldep/inc/soldep/soldlg.hxx
soldep/inc/soldep/tbox.hxx
soldep/prj/d.lst
soldep/source/connctr.cxx
soldep/source/depapp.hxx
soldep/source/depper.cxx
soldep/source/depwin.cxx
soldep/source/makefile.mk
soldep/source/objwin.cxx
soldep/source/soldep.cxx
soldep/source/soldlg.cxx
soldep/source/soldlg.src
soldep/source/tbox.cxx
solenv/bin/build.pl
solenv/bin/cws.pl
solenv/bin/make_installer.pl
solenv/bin/mhids.pl
solenv/bin/modules/CwsConfig.pm
solenv/bin/modules/RepositoryHelper.pm
solenv/bin/modules/installer/regmerge.pm
solenv/bin/modules/installer/scriptitems.pm
solenv/bin/modules/installer/servicesfile.pm
solenv/bin/modules/installer/simplepackage.pm
solenv/bin/modules/installer/substfilenamefiles.pm
solenv/config/ssolar.cmn
solenv/inc/_tg_rslb.mk
solenv/inc/extension_post.mk
solenv/inc/libs.mk
solenv/inc/minor.mk
solenv/inc/postset.mk
solenv/inc/settings.mk
solenv/inc/tg_rslb.mk
solenv/inc/unxlng.mk
solenv/inc/wntmsc.mk
soltools/HIDCompiler/hidclex.l
stlport/prj/d.lst
stlport/systemstlguards/postextstl.h
Diffstat (limited to 'solenv/inc')
36 files changed, 422 insertions, 783 deletions
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk index 8d9e45d33331..85804dd41ac6 100644 --- a/solenv/inc/_cppunit.mk +++ b/solenv/inc/_cppunit.mk @@ -1,7 +1,7 @@ # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL1TARGET)"!="" +.IF "$(SHL1TARGETN)"!="" ALLTAR : test1 test1 .PHONY : $(SHL1TARGETN) @echo ---------------------------------------------------------- @@ -13,7 +13,7 @@ test1 .PHONY : $(SHL1TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL2TARGET)"!="" +.IF "$(SHL2TARGETN)"!="" ALLTAR : test2 test2 .PHONY : $(SHL2TARGETN) @echo ---------------------------------------------------------- @@ -25,7 +25,7 @@ test2 .PHONY : $(SHL2TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL3TARGET)"!="" +.IF "$(SHL3TARGETN)"!="" ALLTAR : test3 test3 .PHONY : $(SHL3TARGETN) @echo ---------------------------------------------------------- @@ -37,7 +37,7 @@ test3 .PHONY : $(SHL3TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL4TARGET)"!="" +.IF "$(SHL4TARGETN)"!="" ALLTAR : test4 test4 .PHONY : $(SHL4TARGETN) @echo ---------------------------------------------------------- @@ -49,7 +49,7 @@ test4 .PHONY : $(SHL4TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL5TARGET)"!="" +.IF "$(SHL5TARGETN)"!="" ALLTAR : test5 test5 .PHONY : $(SHL5TARGETN) @echo ---------------------------------------------------------- @@ -61,7 +61,7 @@ test5 .PHONY : $(SHL5TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL6TARGET)"!="" +.IF "$(SHL6TARGETN)"!="" ALLTAR : test6 test6 .PHONY : $(SHL6TARGETN) @echo ---------------------------------------------------------- @@ -73,7 +73,7 @@ test6 .PHONY : $(SHL6TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL7TARGET)"!="" +.IF "$(SHL7TARGETN)"!="" ALLTAR : test7 test7 .PHONY : $(SHL7TARGETN) @echo ---------------------------------------------------------- @@ -85,7 +85,7 @@ test7 .PHONY : $(SHL7TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL8TARGET)"!="" +.IF "$(SHL8TARGETN)"!="" ALLTAR : test8 test8 .PHONY : $(SHL8TARGETN) @echo ---------------------------------------------------------- @@ -97,7 +97,7 @@ test8 .PHONY : $(SHL8TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL9TARGET)"!="" +.IF "$(SHL9TARGETN)"!="" ALLTAR : test9 test9 .PHONY : $(SHL9TARGETN) @echo ---------------------------------------------------------- @@ -109,7 +109,7 @@ test9 .PHONY : $(SHL9TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL10TARGET)"!="" +.IF "$(SHL10TARGETN)"!="" ALLTAR : test10 test10 .PHONY : $(SHL10TARGETN) @echo ---------------------------------------------------------- diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk index 8248733fb6fb..1edebb8a04df 100644..100755 --- a/solenv/inc/_tg_rslb.mk +++ b/solenv/inc/_tg_rslb.mk @@ -2,22 +2,6 @@ .IF "$(RESLIB1TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB1NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES))) -$(HIDRES1PARTICLE): $(RESLIB1HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES1PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI1) : \ $(RESLIB1SRSFILES) \ $(RESLIB1TARGETN) \ @@ -79,22 +63,6 @@ $(RESLIB1TARGETN): \ .IF "$(RESLIB2TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB2NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES))) -$(HIDRES2PARTICLE): $(RESLIB2HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES2PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI2) : \ $(RESLIB2SRSFILES) \ $(RESLIB2TARGETN) \ @@ -156,22 +124,6 @@ $(RESLIB2TARGETN): \ .IF "$(RESLIB3TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB3NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES))) -$(HIDRES3PARTICLE): $(RESLIB3HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES3PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI3) : \ $(RESLIB3SRSFILES) \ $(RESLIB3TARGETN) \ @@ -233,22 +185,6 @@ $(RESLIB3TARGETN): \ .IF "$(RESLIB4TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB4NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES))) -$(HIDRES4PARTICLE): $(RESLIB4HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES4PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI4) : \ $(RESLIB4SRSFILES) \ $(RESLIB4TARGETN) \ @@ -310,22 +246,6 @@ $(RESLIB4TARGETN): \ .IF "$(RESLIB5TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB5NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES))) -$(HIDRES5PARTICLE): $(RESLIB5HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES5PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI5) : \ $(RESLIB5SRSFILES) \ $(RESLIB5TARGETN) \ @@ -387,22 +307,6 @@ $(RESLIB5TARGETN): \ .IF "$(RESLIB6TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB6NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES))) -$(HIDRES6PARTICLE): $(RESLIB6HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES6PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI6) : \ $(RESLIB6SRSFILES) \ $(RESLIB6TARGETN) \ @@ -464,22 +368,6 @@ $(RESLIB6TARGETN): \ .IF "$(RESLIB7TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB7NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES))) -$(HIDRES7PARTICLE): $(RESLIB7HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES7PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI7) : \ $(RESLIB7SRSFILES) \ $(RESLIB7TARGETN) \ @@ -541,22 +429,6 @@ $(RESLIB7TARGETN): \ .IF "$(RESLIB8TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB8NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES))) -$(HIDRES8PARTICLE): $(RESLIB8HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES8PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI8) : \ $(RESLIB8SRSFILES) \ $(RESLIB8TARGETN) \ @@ -618,22 +490,6 @@ $(RESLIB8TARGETN): \ .IF "$(RESLIB9TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB9NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES))) -$(HIDRES9PARTICLE): $(RESLIB9HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES9PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI9) : \ $(RESLIB9SRSFILES) \ $(RESLIB9TARGETN) \ @@ -695,22 +551,6 @@ $(RESLIB9TARGETN): \ .IF "$(RESLIB10TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB10NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES))) -$(HIDRES10PARTICLE): $(RESLIB10HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES10PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI10) : \ $(RESLIB10SRSFILES) \ $(RESLIB10TARGETN) \ diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk index 33ff97e21986..d13e57990592 100644 --- a/solenv/inc/_tg_scp.mk +++ b/solenv/inc/_tg_scp.mk @@ -7,7 +7,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP1FILES+=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP1TARGETN): $(LOCALSCP1FILES) @echo "Making: " $(@:f) @@ -25,7 +25,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP2FILES+=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP2TARGETN): $(LOCALSCP2FILES) @echo "Making: " $(@:f) @@ -43,7 +43,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP3FILES+=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP3TARGETN): $(LOCALSCP3FILES) @echo "Making: " $(@:f) @@ -61,7 +61,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP4FILES+=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP4TARGETN): $(LOCALSCP4FILES) @echo "Making: " $(@:f) @@ -79,7 +79,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP5FILES+=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP5TARGETN): $(LOCALSCP5FILES) @echo "Making: " $(@:f) @@ -97,7 +97,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP6FILES+=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP6TARGETN): $(LOCALSCP6FILES) @echo "Making: " $(@:f) @@ -115,7 +115,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP7FILES+=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP7TARGETN): $(LOCALSCP7FILES) @echo "Making: " $(@:f) @@ -133,7 +133,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP8FILES+=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP8TARGETN): $(LOCALSCP8FILES) @echo "Making: " $(@:f) @@ -151,7 +151,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP9FILES+=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP9TARGETN): $(LOCALSCP9FILES) @echo "Making: " $(@:f) @@ -169,7 +169,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP10FILES+=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP10TARGETN): $(LOCALSCP10FILES) @echo "Making: " $(@:f) diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk index 5b3db9c696b7..45ea433b04b2 100644 --- a/solenv/inc/_tg_sdi.mk +++ b/solenv/inc/_tg_sdi.mk @@ -1,14 +1,5 @@ # unroll begin -.IF "$(HIDSID1PARTICLE)"!="" -$(HIDSID1PARTICLE): $(SDI1TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID1PARTICLE)"!="" - .IF "$(SDI1TARGET)"!="" $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi @echo "Making: " $(@:f) @@ -27,15 +18,6 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID2PARTICLE)"!="" -$(HIDSID2PARTICLE): $(SDI2TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID2PARTICLE)"!="" - .IF "$(SDI2TARGET)"!="" $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi @echo "Making: " $(@:f) @@ -54,15 +36,6 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID3PARTICLE)"!="" -$(HIDSID3PARTICLE): $(SDI3TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID3PARTICLE)"!="" - .IF "$(SDI3TARGET)"!="" $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi @echo "Making: " $(@:f) @@ -81,15 +54,6 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID4PARTICLE)"!="" -$(HIDSID4PARTICLE): $(SDI4TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID4PARTICLE)"!="" - .IF "$(SDI4TARGET)"!="" $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi @echo "Making: " $(@:f) @@ -108,15 +72,6 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID5PARTICLE)"!="" -$(HIDSID5PARTICLE): $(SDI5TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID5PARTICLE)"!="" - .IF "$(SDI5TARGET)"!="" $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi @echo "Making: " $(@:f) @@ -135,15 +90,6 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID6PARTICLE)"!="" -$(HIDSID6PARTICLE): $(SDI6TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID6PARTICLE)"!="" - .IF "$(SDI6TARGET)"!="" $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi @echo "Making: " $(@:f) @@ -162,15 +108,6 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID7PARTICLE)"!="" -$(HIDSID7PARTICLE): $(SDI7TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID7PARTICLE)"!="" - .IF "$(SDI7TARGET)"!="" $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi @echo "Making: " $(@:f) @@ -189,15 +126,6 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID8PARTICLE)"!="" -$(HIDSID8PARTICLE): $(SDI8TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID8PARTICLE)"!="" - .IF "$(SDI8TARGET)"!="" $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi @echo "Making: " $(@:f) @@ -216,15 +144,6 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID9PARTICLE)"!="" -$(HIDSID9PARTICLE): $(SDI9TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID9PARTICLE)"!="" - .IF "$(SDI9TARGET)"!="" $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi @echo "Making: " $(@:f) @@ -243,15 +162,6 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi # Instruction for ??? # unroll begin -.IF "$(HIDSID10PARTICLE)"!="" -$(HIDSID10PARTICLE): $(SDI10TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID10PARTICLE)"!="" - .IF "$(SDI10TARGET)"!="" $(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi @echo "Making: " $(@:f) diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 56a187abcce4..5f58147fdff1 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -333,7 +333,7 @@ $(SHL1TARGETN) : \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -357,7 +357,7 @@ $(SHL1TARGETN) : \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -440,8 +440,10 @@ $(SHL1TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_1.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL1RPATH) $@ +.IF "$(SHL1CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL1CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL1NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN) @@ -527,7 +529,6 @@ $(SHL1TARGETN) : \ $(SHL1STDLIBS:^"-l") \ $(SHL1LINKRES) \ $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -538,16 +539,6 @@ $(SHL1TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL1TARGET) - -runtest_$(SHL1TARGET) : $(SHL1TARGETN) - testshl $(SHL1TARGETN) sce/$(SHL1TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL1TARGETN)"!="" # unroll begin @@ -885,7 +876,7 @@ $(SHL2TARGETN) : \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -909,7 +900,7 @@ $(SHL2TARGETN) : \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -992,8 +983,10 @@ $(SHL2TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_2.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL2RPATH) $@ +.IF "$(SHL2CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL2CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL2NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN) @@ -1079,7 +1072,6 @@ $(SHL2TARGETN) : \ $(SHL2STDLIBS:^"-l") \ $(SHL2LINKRES) \ $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -1090,16 +1082,6 @@ $(SHL2TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL2TARGET) - -runtest_$(SHL2TARGET) : $(SHL2TARGETN) - testshl $(SHL2TARGETN) sce/$(SHL2TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL2TARGETN)"!="" # unroll begin @@ -1437,7 +1419,7 @@ $(SHL3TARGETN) : \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -1461,7 +1443,7 @@ $(SHL3TARGETN) : \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -1544,8 +1526,10 @@ $(SHL3TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_3.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL3RPATH) $@ +.IF "$(SHL3CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL3CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL3NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN) @@ -1631,7 +1615,6 @@ $(SHL3TARGETN) : \ $(SHL3STDLIBS:^"-l") \ $(SHL3LINKRES) \ $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -1642,16 +1625,6 @@ $(SHL3TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL3TARGET) - -runtest_$(SHL3TARGET) : $(SHL3TARGETN) - testshl $(SHL3TARGETN) sce/$(SHL3TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL3TARGETN)"!="" # unroll begin @@ -1989,7 +1962,7 @@ $(SHL4TARGETN) : \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -2013,7 +1986,7 @@ $(SHL4TARGETN) : \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -2096,8 +2069,10 @@ $(SHL4TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_4.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL4RPATH) $@ +.IF "$(SHL4CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL4CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL4NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN) @@ -2183,7 +2158,6 @@ $(SHL4TARGETN) : \ $(SHL4STDLIBS:^"-l") \ $(SHL4LINKRES) \ $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -2194,16 +2168,6 @@ $(SHL4TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL4TARGET) - -runtest_$(SHL4TARGET) : $(SHL4TARGETN) - testshl $(SHL4TARGETN) sce/$(SHL4TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL4TARGETN)"!="" # unroll begin @@ -2541,7 +2505,7 @@ $(SHL5TARGETN) : \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -2565,7 +2529,7 @@ $(SHL5TARGETN) : \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -2648,8 +2612,10 @@ $(SHL5TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_5.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL5RPATH) $@ +.IF "$(SHL5CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL5CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL5NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN) @@ -2735,7 +2701,6 @@ $(SHL5TARGETN) : \ $(SHL5STDLIBS:^"-l") \ $(SHL5LINKRES) \ $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -2746,16 +2711,6 @@ $(SHL5TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL5TARGET) - -runtest_$(SHL5TARGET) : $(SHL5TARGETN) - testshl $(SHL5TARGETN) sce/$(SHL5TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL5TARGETN)"!="" # unroll begin @@ -3093,7 +3048,7 @@ $(SHL6TARGETN) : \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3117,7 +3072,7 @@ $(SHL6TARGETN) : \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3200,8 +3155,10 @@ $(SHL6TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_6.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL6RPATH) $@ +.IF "$(SHL6CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL6CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL6NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN) @@ -3287,7 +3244,6 @@ $(SHL6TARGETN) : \ $(SHL6STDLIBS:^"-l") \ $(SHL6LINKRES) \ $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -3298,16 +3254,6 @@ $(SHL6TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL6TARGET) - -runtest_$(SHL6TARGET) : $(SHL6TARGETN) - testshl $(SHL6TARGETN) sce/$(SHL6TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL6TARGETN)"!="" # unroll begin @@ -3645,7 +3591,7 @@ $(SHL7TARGETN) : \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3669,7 +3615,7 @@ $(SHL7TARGETN) : \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -3752,8 +3698,10 @@ $(SHL7TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_7.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL7RPATH) $@ +.IF "$(SHL7CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL7CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL7NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN) @@ -3839,7 +3787,6 @@ $(SHL7TARGETN) : \ $(SHL7STDLIBS:^"-l") \ $(SHL7LINKRES) \ $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -3850,16 +3797,6 @@ $(SHL7TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL7TARGET) - -runtest_$(SHL7TARGET) : $(SHL7TARGETN) - testshl $(SHL7TARGETN) sce/$(SHL7TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL7TARGETN)"!="" # unroll begin @@ -4197,7 +4134,7 @@ $(SHL8TARGETN) : \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4221,7 +4158,7 @@ $(SHL8TARGETN) : \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4304,8 +4241,10 @@ $(SHL8TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_8.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL8RPATH) $@ +.IF "$(SHL8CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL8CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL8NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN) @@ -4391,7 +4330,6 @@ $(SHL8TARGETN) : \ $(SHL8STDLIBS:^"-l") \ $(SHL8LINKRES) \ $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -4402,16 +4340,6 @@ $(SHL8TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL8TARGET) - -runtest_$(SHL8TARGET) : $(SHL8TARGETN) - testshl $(SHL8TARGETN) sce/$(SHL8TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL8TARGETN)"!="" # unroll begin @@ -4749,7 +4677,7 @@ $(SHL9TARGETN) : \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4773,7 +4701,7 @@ $(SHL9TARGETN) : \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -4856,8 +4784,10 @@ $(SHL9TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_9.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL9RPATH) $@ +.IF "$(SHL9CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL9CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL9NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN) @@ -4943,7 +4873,6 @@ $(SHL9TARGETN) : \ $(SHL9STDLIBS:^"-l") \ $(SHL9LINKRES) \ $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -4954,16 +4883,6 @@ $(SHL9TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL9TARGET) - -runtest_$(SHL9TARGET) : $(SHL9TARGETN) - testshl $(SHL9TARGETN) sce/$(SHL9TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL9TARGETN)"!="" # unroll begin @@ -5301,7 +5220,7 @@ $(SHL10TARGETN) : \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -5325,7 +5244,7 @@ $(SHL10TARGETN) : \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -5408,8 +5327,10 @@ $(SHL10TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_10.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL10RPATH) $@ +.IF "$(SHL10CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL10CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL10NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN) @@ -5495,7 +5416,6 @@ $(SHL10TARGETN) : \ $(SHL10STDLIBS:^"-l") \ $(SHL10LINKRES) \ $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -5506,16 +5426,6 @@ $(SHL10TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL10TARGET) - -runtest_$(SHL10TARGET) : $(SHL10TARGETN) - testshl $(SHL10TARGETN) sce/$(SHL10TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL10TARGETN)"!="" # unroll begin diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index a71216f0a7e9..375fab35b800 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -1,22 +1,10 @@ # unroll begin .IF "$(SRS1NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS1NAME)_srs.hid -$(HIDSRS1PARTICLE) : $(HID1FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS1PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) +$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS1NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES) @@ -54,22 +42,10 @@ $(SRS)/$(SRS1NAME).srs: $(SRC1FILES) # unroll begin .IF "$(SRS2NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS2NAME)_srs.hid -$(HIDSRS2PARTICLE) : $(HID2FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS2PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) +$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS2NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES) @@ -107,22 +83,10 @@ $(SRS)/$(SRS2NAME).srs: $(SRC2FILES) # unroll begin .IF "$(SRS3NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS3NAME)_srs.hid -$(HIDSRS3PARTICLE) : $(HID3FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS3PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) +$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS3NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES) @@ -160,22 +124,10 @@ $(SRS)/$(SRS3NAME).srs: $(SRC3FILES) # unroll begin .IF "$(SRS4NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS4NAME)_srs.hid -$(HIDSRS4PARTICLE) : $(HID4FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS4PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) +$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS4NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES) @@ -213,22 +165,10 @@ $(SRS)/$(SRS4NAME).srs: $(SRC4FILES) # unroll begin .IF "$(SRS5NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS5NAME)_srs.hid -$(HIDSRS5PARTICLE) : $(HID5FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS5PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) +$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS5NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES) @@ -266,22 +206,10 @@ $(SRS)/$(SRS5NAME).srs: $(SRC5FILES) # unroll begin .IF "$(SRS6NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS6NAME)_srs.hid -$(HIDSRS6PARTICLE) : $(HID6FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS6PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) +$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS6NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES) @@ -319,22 +247,10 @@ $(SRS)/$(SRS6NAME).srs: $(SRC6FILES) # unroll begin .IF "$(SRS7NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS7NAME)_srs.hid -$(HIDSRS7PARTICLE) : $(HID7FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS7PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) +$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS7NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES) @@ -372,22 +288,10 @@ $(SRS)/$(SRS7NAME).srs: $(SRC7FILES) # unroll begin .IF "$(SRS8NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS8NAME)_srs.hid -$(HIDSRS8PARTICLE) : $(HID8FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS8PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) +$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS8NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES) @@ -425,22 +329,10 @@ $(SRS)/$(SRS8NAME).srs: $(SRC8FILES) # unroll begin .IF "$(SRS9NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS9NAME)_srs.hid -$(HIDSRS9PARTICLE) : $(HID9FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS9PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) +$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS9NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES) @@ -478,22 +370,10 @@ $(SRS)/$(SRS9NAME).srs: $(SRC9FILES) # unroll begin .IF "$(SRS10NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS10NAME)_srs.hid -$(HIDSRS10PARTICLE) : $(HID10FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS10PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) +$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS10NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES) diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk index 2173f1a9ff9a..b30ca7152700 100644 --- a/solenv/inc/cppunit.mk +++ b/solenv/inc/cppunit.mk @@ -44,7 +44,7 @@ # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL$(TNR)TARGET)"!="" +.IF "$(SHL$(TNR)TARGETN)"!="" ALLTAR : test$(TNR) test$(TNR) .PHONY : $(SHL$(TNR)TARGETN) @echo ---------------------------------------------------------- diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index bfd8e6695684..5204af7dd29a 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -69,10 +69,22 @@ $(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f) .ENDIF # "$(COMPONENT_JARFILES)"!="" .IF "$(COMPONENT_LIBRARIES)"!="" +PACK_RUNTIME!:=TRUE # TODO(Q3): strip the binary? $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(COPY) $< $@ +.ENDIF # "$(COMPONENT_LIBRARIES)"!="" + +.IF "$(PACK_RUNTIME)"!="" +PACK_RUNTIME_FLAG:=$(MISC)/$(TARGET)_pack_runtime.flag +$(EXTENSION_TARGET) : $(PACK_RUNTIME_FLAG) + +$(EXTENSIONDIR) : + @@-$(MKDIRHIER) $(@:d) + +$(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR) + @@-$(MKDIRHIER) $(@:d) .IF "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES" .IF "$(COM)"=="GCC" $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR) @@ -120,7 +132,8 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f) .ENDIF # "$(PACKMS)"!="" .ENDIF #"$(COM)"=="GCC" .ENDIF # "$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES" -.ENDIF # "$(COMPONENT_LIBRARIES)"!="" + @$(TOUCH) $@ +.ENDIF # "$(PACK_RUNTIME)"!="" IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)" diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 15a80b02dcde..7b926cc75b66 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -89,35 +89,46 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \ echo "$$my_tmp" > $@ .END -cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb +cpptest .PHONY : $(RM) -r $(MISC)/$(TARGET)/user $(MKDIRHIER) $(MISC)/$(TARGET)/user $(CPPUNITTESTER) \ - -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \ + -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \ - $(my_cppenv) $(OOO_CPPTEST_ARGS) - $(RM) -r $(MISC)/$(TARGET)/user + $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") $(CPPTEST_LIBRARY) + # As a workaround for #i111400#, ignore failure of $(RM): + - $(RM) -r $(MISC)/$(TARGET)/user .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag cpptest : $(MISC)/$(TARGET)/installation.flag .END -$(MISC)/$(TARGET)/services.rdb : - $(MKDIRHIER) $(@:d) - $(RM) $@ - $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \ - -c remotebridge.uno -c uuresolver.uno - .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" -javatest .PHONY : $(JAVATARGET) +javatest_% .PHONY : $(JAVATARGET) + $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ + '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ + -Dorg.openoffice.test.arg.soffice=$(my_soffice) \ + -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \ + $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \ + org.junit.runner.JUnitCore \ + $(subst,/,. $(PACKAGE)).$(@:s/javatest_//) $(RM) -r $(MISC)/$(TARGET)/user - $(MKDIRHIER) $(MISC)/$(TARGET)/user - $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" + $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag +javatest : $(MISC)/$(TARGET)/installation.flag +.END +javatest .PHONY : $(JAVATARGET) + $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ -Dorg.openoffice.test.arg.soffice=$(my_soffice) \ -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \ - $(my_javaenv) org.junit.runner.JUnitCore \ + $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \ + org.junit.runner.JUnitCore \ $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//)) $(RM) -r $(MISC)/$(TARGET)/user .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk index e129052a445e..6d7c564da2a0 100644 --- a/solenv/inc/javaunittest.mk +++ b/solenv/inc/javaunittest.mk @@ -52,9 +52,8 @@ # <platform>/class/, so that they are not accidentally included in jar files # packed from <platform>/class/ subdirectories. -TESTS := $(subst,.java,.test $(JAVATESTFILES)) JAVAFILES +:= $(JAVATESTFILES) -JARFILES +:= OOoRunner.jar +EXTRAJARFILES += $(OOO_JUNIT_JAR) .INCLUDE: settings.mk @@ -67,22 +66,26 @@ CLASSDIR !:= $(CLASSDIR)/test .INCLUDE: target.mk -ALLTAR: $(TESTS) - -$(JAVAFILES): $(MISC)/$(TARGET).classdir.flag +$(JAVATARGET) : $(MISC)/$(TARGET).classdir.flag $(MISC)/$(TARGET).classdir.flag: - $(MKDIR) $(CLASSDIR) $(TOUCH) $@ -.IF "$(TESTS)" != "" -$(TESTS): $(JAVACLASSFILES) -.ENDIF +.IF "$(JAVATESTFILES)" != "" +ALLTAR : test +.END -%.test .PHONY: %.java - $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner \ - -TestBase java_complex -NoOffice yes \ - -o $(subst,/,. $(subst,.test, $(PACKAGE).$@)) +.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" +test .PHONY : $(JAVATARGET) + $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ + '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ + org.junit.runner.JUnitCore \ + $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//)) +.ELSE +test .PHONY : + echo 'test needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' +.END .IF "$(IDLTESTFILES)" != "" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk new file mode 100644 index 000000000000..e3ac2e5065ff --- /dev/null +++ b/solenv/inc/langlist.mk @@ -0,0 +1,163 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +completelangiso=af \ +ar \ +as \ +as-IN \ +ast \ +be-BY \ +bo \ +bg \ +br \ +brx \ +bn \ +bn-BD \ +bn-IN \ +bs \ +by \ +ca \ +ca-XV \ +cs \ +cy \ +da \ +de \ +dgo \ +dz \ +el \ +en-GB \ +en-US \ +en-ZA \ +eo \ +es \ +et \ +eu \ +fa \ +fi \ +fr \ +ga \ +gd \ +gl \ +gu \ +gu-IN \ +he \ +hi \ +hi-IN \ +hr \ +ht \ +hu \ +is \ +it \ +ja \ +kid \ +ky \ +ka \ +kab \ +kk \ +km \ +kn \ +ko \ +kok \ +ks \ +ku \ +lo \ +lt \ +lv \ +mai \ +mk \ +mn \ +mni \ +ms \ +ml \ +ml-IN \ +mr \ +mr-IN \ +my \ +ne \ +nb \ +nl \ +nn \ +nr \ +ns \ +nso \ +om \ +oms \ +oc \ +or \ +or-IN \ +pap \ +pa \ +pa-IN \ +pl \ +ps \ +pt \ +pt-BR \ +gug \ +pyg \ +ro \ +ru \ +rw \ +sat \ +sa \ +sa-IN \ +si \ +sc \ +sd \ +sq \ +sk \ +sl \ +sh \ +son \ +sr \ +ss \ +st \ +sv \ +sw \ +sw-TZ \ +te \ +te-IN \ +ti \ +ti-ER \ +ta \ +ta-IN \ +tlh \ +th \ +tn \ +tr \ +ts \ +tg \ +ug \ +ur \ +ur-IN \ +uk \ +uz \ +ve \ +vi \ +xh \ +zh-CN \ +zh-TW \ +zu diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index f8ed465f2168..6c1777349d39 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -66,7 +66,7 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) -COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID) +COMPHELPERLIB=-lcomphelp$(COMID) CONNECTIVITYLIB=-lconnectivity LDAPBERLIB=-lldapber TOOLSLIBST=-latools @@ -183,9 +183,7 @@ SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail DOCMGRLIB=-ldmg$(DLLPOSTFIX) BASICLIB=-lsb$(DLLPOSTFIX) -.IF "$(ENABLE_VBA)"=="YES" VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX) -.ENDIF DBTOOLSLIB=-ldbtools$(DLLPOSTFIX) HM2LIBSH=-lhmwrpdll HM2LIBST=-lhmwrap @@ -355,6 +353,7 @@ LPSOLVELIB=-llpsolve55 SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp TESTLIB=-ltest +XMLREADERLIB=-lxmlreader .ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -535,5 +534,6 @@ SOFFICELIB=isofficeapp.lib UNOPKGAPPLIB=iunopkgapp.lib TESTLIB=itest.lib BOOSTTHREADLIB=boostthread.lib +XMLREADERLIB=ixmlreader.lib .ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 3e2745f9ddf7..f828ae6400de 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ -RSCVERSION=330 -RSCREVISION=330m19(Build:6) -BUILD=6 -LAST_MINOR=m19 -SOURCEVERSION=OOO330 +RSCVERSION=300 +RSCREVISION=300m101(Build:1) +BUILD=1 +LAST_MINOR=m101 +SOURCEVERSION=DEV300 diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h index a50e7b6e93d6..f53ee6ae0e03 100644 --- a/solenv/inc/postmac.h +++ b/solenv/inc/postmac.h @@ -26,8 +26,8 @@ * ************************************************************************/ -#undef Boolean -#undef BOOL +//#undef Boolean +//#undef BOOL #undef Button #undef Byte #undef Control @@ -46,7 +46,7 @@ #undef SetCursor #undef StringPtr #undef DirInfo -#undef ULONG +//#undef ULONG #undef Line #undef TimeValue #undef Pattern diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index f602c64f07c5..abf0a7b6ca92 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -27,8 +27,8 @@ ************************************************************************/ -#define Boolean MacOSBoolean -#define BOOL MacOSBOOL +//#define Boolean MacOSBoolean +//#define BOOL MacOSBOOL #define Button MacOSButton #define Byte MacOSByte #define Control MacOSControl @@ -46,7 +46,7 @@ #define SetCursor MacOSSetCursor #define StringPtr MacOSStringPtr #define DirInfo MacOSDirInfo -#define ULONG MacOSULONG +//#define ULONG MacOSULONG #define Line MacOSLine #define TimeValue MacOSTimeValue #define Pattern MacOSPattern diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 74c50ae9616d..a845b9ae86fe 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -153,24 +153,3 @@ $(PAR)/%.par : # $(COMMAND_ECHO)$(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@ .ENDIF # "$(PARFILES)"!="" - -.IF "$(TESTDIR)"!="" - -# workaround for strange dmake bug: -# if the previous block was a rule or a target, "\#" isn't recognized -# as an escaped "#". if it was an assignment, escaping works... -some_unique_variable_name:=1 - -.IF "$(OS)" == "WNT" -REGEXP:="s/^[\#].*//" -.ELSE -REGEXP:='s/^[\#].*//' -.ENDIF - -$(MISC)/%.exp : sce/%.sce - @@-$(RM) $@ - @@-$(RM) $(@:d)$(@:b).tst - $(COMMAND_ECHO)$(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" > $(@:d)$(@:b).tst - $(COMMAND_ECHO)$(TYPE) $(@:d)$(@:b).tst | sed "/test_./ w $@" - -.ENDIF # "$(TESTDIR)"!="" diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index a2797d2aee82..db97eddea355 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -600,7 +600,7 @@ $(MISC)/%.dpr : .IF "$(nodep)"=="" @echo "Making: " $(@:f) @@-$(RM) $@ - $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES) + $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_srs_deps=true $(DEPSRSFILES) $(COMMAND_ECHO)-$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@ .ENDIF # "$(nodep)"=="" @@ -689,11 +689,6 @@ $(OUT)/ucr/$(IDLPACKAGE)/%.urd : %.idl $(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl @noop $(assign all_outdated_doc_idl+:=$<) -# generate hid files -$(SRS)/%.hid : %.src - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src - $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE) - # make *.xml descriptions available in $(MISC) $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml $(COMMAND_ECHO)$(COPY) $< $@ diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 99226cd6348f..de93a62e9c75 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -302,6 +302,12 @@ dbgutil= # --------------------------------------------------------------------------- DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD)) +.IF "$(GUI)"=="WNT" +posix_PWD:=/cygdrive/$(PWD:s/://) +.ELSE #GUI)"=="WNT" +posix_PWD:=$(PWD) +.ENDIF #GUI)"=="WNT" + .IF "$(TMP)"!="" tmp*=$(TMP) @@ -386,9 +392,11 @@ COMPILER_WARN_ALL=TRUE COMPILER_WARN_ERRORS=TRUE .ENDIF -.IF "$(COMMON_BUILD)"!="" -common_build*=$(COMMON_BUILD) -.ENDIF +#.IF "$(COMMON_BUILD)"!="" +#common_build*=$(COMMON_BUILD) +#.ENDIF +common_build:= +COMMON_BUILD:= .IF "$(USE_SHL_VERSIONS)"!="" use_shl_versions*=$(USE_SHL_VERSIONS) @@ -573,24 +581,24 @@ PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD)) PATH_IN_MODULE:= .ENDIF # "$(PRJ)"!="." -# common output tree -.IF "$(common_build)"!="" -COMMON_OUTDIR*=common -.IF "$(no_common_build_reslib)"=="" -common_build_reslib=true -.ENDIF # "$(no_common_build_reslib)"=="" -.IF "$(no_common_build_zip)"=="" -common_build_zip=true -.ENDIF # "$(no_common_build_zip)"=="" -.IF "$(no_common_build_sign_jar)"=="" -common_build_sign_jar=true -.ENDIF # "$(no_common_build_sign_jar)"=="" -.IF "$(no_common_build_srs)"=="" -common_build_srs=true -.ENDIF # "$(no_common_build_srs)"=="" -.ELSE # "$(common_build)"!="" +## common output tree +#.IF "$(common_build)"!="" +#COMMON_OUTDIR*=common +#.IF "$(no_common_build_reslib)"=="" +#common_build_reslib=true +#.ENDIF # "$(no_common_build_reslib)"=="" +#.IF "$(no_common_build_zip)"=="" +#common_build_zip=true +#.ENDIF # "$(no_common_build_zip)"=="" +#.IF "$(no_common_build_sign_jar)"=="" +#common_build_sign_jar=true +#.ENDIF # "$(no_common_build_sign_jar)"=="" +#.IF "$(no_common_build_srs)"=="" +#common_build_srs=true +#.ENDIF # "$(no_common_build_srs)"=="" +#.ELSE # "$(common_build)"!="" COMMON_OUTDIR:=$(OUTPATH) -.ENDIF # "$(common_build)"!="" +#.ENDIF # "$(common_build)"!="" LOCAL_OUT:=$(OUT) LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) @@ -598,27 +606,25 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) # --- generate output tree ----------------------------------------- +# disable for makefiles wrapping a gnumake module +.IF "$(TARGET)"!="prj" # As this is not part of the initial startup makefile we define an infered # target instead of using $(OUT)/inc/myworld.mk as target name. # (See iz62795) -$(OUT)/inc/%world.mk : +$(posix_PWD)/$(OUT)/inc/%world.mk : @$(MKOUT) $(ROUT) @echo $(EMQ)# > $@ -# don't need/want output trees in solenv!!! -.IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(OUT)/inc/myworld.mk -.ENDIF # "$(PRJNAME)"!="solenv" +.INCLUDE : $(posix_PWD)/$(OUT)/inc/myworld.mk .IF "$(common_build)"!="" -$(LOCAL_COMMON_OUT)/inc/%world.mk : +$(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk : @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT)) @echo $(EMQ)# > $@ -.IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk -.ENDIF # "$(PRJNAME)"!="solenv" +.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk .ENDIF # "$(common_build)"!="" +.ENDIF # "$(TARGET)"!="prj" .INCLUDE .IGNORE : office.mk @@ -803,12 +809,7 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR) .EXPORT : SOLARBINDIR -.IF "$(GUI)"=="WNT" -# we assume that we build using cygwin -L10N_MODULE*=$(cygpath -m $(realpath $(SOLARSRC)$/l10n)) -.ELSE -L10N_MODULE*=$(SOLARSRC)$/l10n -.ENDIF +L10N_MODULE*=$(SOURCE_ROOT_DIR)/l10n/l10n ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so .IF "$(WITH_LANG)"!="" @@ -1020,15 +1021,15 @@ LNTFLAGSOUTOBJ=-os .ENDIF .IF "$(OOO_LIBRARY_PATH_VAR)" != "" -# Add SOLARLIBDIR to the end of a (potentially previously undefined) library -# path (LD_LIBRARY_PATH, PATH, etc.; there is no real reason to prefer adding at -# the end over adding at the start); the ": &&" in the bash case enables this to -# work at the start of a recipe line that is not prefixed by "+" as well as in -# the middle of an existing && chain: +# Add SOLARLIBDIR at the begin of a (potentially previously undefined) library +# path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from +# an existing office/URE installation; the ": &&" enables this to work at the +# start of a recipe line that is not prefixed by "+" as well as in the middle of +# an existing && chain: AUGMENT_LIBRARY_PATH = : && \ - $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(SOLARSHAREDBIN)) + $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} AUGMENT_LIBRARY_PATH_LOCAL = : && \ - $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN)) + $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}} .END # for multiprocess building in external modules @@ -1364,6 +1365,20 @@ XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar CPPUNIT_CFLAGS = .END +COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ +COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ +.IF "$(OS)" == "WNT" +COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/ +.ELSE +COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/ +.END +COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/ +COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: +COMPONENTPREFIX_INBUILD_NATIVE = \ + vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/ +COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/ +COMPONENTPREFIX_EXTENSION = ./ + # workaround for strange dmake bug: # if the previous block was a rule or a target, "\#" isn't recognized # as an escaped "#". if it was an assignment, escaping works... diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 0fe06145879d..6e8007425454 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -960,31 +960,26 @@ NO_SDINAME_allowed .IF "$(SDI1NAME)"!="" .DIRCACHE=no SDI1TARGET=$(MISC)/$(SDI1NAME).don -HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI1NAME)_sid.hid .ENDIF .IF "$(SDI2NAME)"!="" .DIRCACHE=no SDI2TARGET=$(MISC)/$(SDI2NAME).don -HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI2NAME)_sid.hid .ENDIF .IF "$(SDI3NAME)"!="" .DIRCACHE=no SDI3TARGET=$(MISC)/$(SDI3NAME).don -HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI3NAME)_sid.hid .ENDIF .IF "$(SDI4NAME)"!="" .DIRCACHE=no SDI4TARGET=$(MISC)/$(SDI4NAME).don -HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI4NAME)_sid.hid .ENDIF .IF "$(SDI5NAME)"!="" .DIRCACHE=no SDI5TARGET=$(MISC)/$(SDI5NAME).don -HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI5NAME)_sid.hid .ENDIF .IF "$(XMLPROPERTIES)"!="" @@ -1008,17 +1003,6 @@ TARGETDPJ=$(MISC)/$(TARGET).dpj .ENDIF # "$(L10N_framework)"=="" .ENDIF -.IF "$(no_hids)$(NO_HIDS)"=="" -BUILDHIDS:=TRUE -.IF "$(GEN_HID_OTHER)"!="" -PRJHIDOTHERTARGET=$(SRS)/hidother.hid -COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)/$(TARGET)_othr.hid) -.ENDIF -.IF "$(GEN_HID2)"!="" -PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst -.ENDIF -.ENDIF # "$(no_hids)$(NO_HIDS)"=="" - .IF "$(make_srs_deps)"=="" .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != "" DPRTARGET= $(MISC)/$(TARGET).dpr @@ -1056,8 +1040,6 @@ ALLTAR: \ $(DPRTARGET) \ $(DPZTARGET) \ $(ZIPALL) \ - $(HIDSID1PARTICLE) $(HIDSID2PARTICLE) \ - $(HIDSID3PARTICLE) $(HIDSID4PARTICLE) $(HIDSID5PARTICLE) \ $(SDITARGET) $(SDI1TARGET) $(SDI2TARGET) \ $(SDI3TARGET) $(SDI4TARGET) $(SDI5TARGET) \ $(XMLPROPERTIESN) \ @@ -1095,8 +1077,6 @@ ALLTAR: \ $(RESLIB3TARGETN) $(RESLIB4TARGETN) \ $(RESLIB5TARGETN) $(RESLIB6TARGETN) \ $(RESLIB7TARGETN) $(RESLIB8TARGETN) \ - $(COMMONPRJHIDOTHERTARGET) \ - $(PRJHID2TARGET) \ $(LOCALIZE_ME_DEST)\ last_target @@ -1134,8 +1114,6 @@ ALLTAR: \ $(COMP9RDBTARGETN) \ $(IDL1TARGET) $(IDL2TARGET) $(IDL3TARGET) \ $(IDL4TARGET) $(IDL5TARGET) \ - $(HIDSID1PARTICLE) $(HIDSID2PARTICLE) \ - $(HIDSID3PARTICLE) $(HIDSID4PARTICLE) $(HIDSID5PARTICLE) \ $(SDI1TARGET) $(SDI2TARGET) $(SDI3TARGET) \ $(SDI4TARGET) $(SDI5TARGET) \ $(HXXCOPYTARGET) \ @@ -1204,8 +1182,6 @@ ALLTAR: \ $(RESLIB5TARGETN) $(RESLIB6TARGETN) \ $(RESLIB7TARGETN) $(RESLIB8TARGETN) \ $(RESLIB9TARGETN) \ - $(COMMONPRJHIDOTHERTARGET) \ - $(PRJHID2TARGET) \ $(SIGNFORNETSCAPE) \ $(SIGNFOREXPLORER) \ $(SIGNFORJARSIGNER) \ @@ -1538,22 +1514,14 @@ $(MISC)/$(TARGET)_%.done : %.xrb @@$(RM) $(MISC)/$(<:b).interm$(TARGET) .ENDIF # "$(XMLPROPERTIES)"!="" -.IF "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!="" +.IF "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!="" .INCLUDE : _tg_sdi.mk -.ENDIF # "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!="" +.ENDIF # "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!="" .IF "$(DEF1NAME)$(DEF2NAME)$(DEF3NAME)$(DEF4NAME)$(DEF5NAME)$(DEF6NAME)$(DEF7NAME)$(DEF8NAME)$(DEF9NAME)"!="" .INCLUDE : _tg_def.mk .ENDIF -.IF "$(COMMONPRJHIDOTHERTARGET)"!="" -$(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET) - @echo "Making: " $@ - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) - $(COMMAND_ECHO)$(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF - # ------- # - LIB - # ------- @@ -2022,17 +1990,17 @@ UNOUCRDEPxxx : $(UNOUCRDEP); .ENDIF # "$(UNOTYPES)" != "" -#new hid.lst trigger with GEN_HID2=TRUE -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY : - @echo "Making: " $@ - @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp - $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) - @-$(RENAME) $@.$(ROUT).tmp $@ - @-mkdir $(@:d)hid - $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI) - @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv +##new hid.lst trigger with GEN_HID2=TRUE +#$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY : +# @echo "Making: " $@ +# @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp +# $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp +# @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) +# @-$(RENAME) $@.$(ROUT).tmp $@ +# @-mkdir $(@:d)hid +# $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp +# @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI) +# @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv .IF "$(SOLAR_JAVA)"!="" diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index f15bd8f99804..cd66717b96c4 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -303,11 +303,11 @@ $(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack #.IF "$(my4ver:s/.//:s/,//)" >= "300" # $(COMMAND_ECHO)cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) #.ELSE # "$(my4ver:s/.//:s/,//)" >= "300" - $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 + $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 #.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300" .ELSE # "$(GUI)"=="WNT" .IF "$(BSCLIENT)"=="TRUE" - $(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 + $(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 .ELSE # "$(BSCLIENT)"!="" $(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 .ENDIF # "$(BSCLIENT)"!="" diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index 6faf113aeaa5..5c6101d90c12 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -67,6 +67,14 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) .ENDIF # "$(JARMANIFEST)"!="" .ENDIF # "$(NEW_JAR_PACK)"!="" +.IF "$(JARCLASSEXCLUDES)" == "" +ZIPJAR_EXCLUDE= +.ELSE # "$(JARCLASSEXCLUDES)" == "" +ZIPJAR_EXCLUDE=$(foreach,i,$(JARCLASSEXCLUDES) -x "$i") +# format: +# JARCLASSEXCLUDES=foo/* bar/* +.ENDIF # "$(JARCLASSEXCLUDES)" == "" + # # build jar # @@ -82,8 +90,8 @@ $(JARTARGETN) : @-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1 .ENDIF .IF "$(JARMANIFEST)"!="" - $(COMMAND_ECHO)cd $(CLASSDIR)/$(TARGET) && zip $(ZIP_VERBOSITY) -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(CHECKZIPRESULT) + $(COMMAND_ECHO)cd $(CLASSDIR)/$(TARGET) && zip $(ZIP_VERBOSITY) -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT) .ENDIF # "$(JARMANIFEST)"!="" - $(COMMAND_ECHO)cd $(CLASSDIR) && zip $(ZIP_VERBOSITY) -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT) + $(COMMAND_ECHO)cd $(CLASSDIR) && zip $(ZIP_VERBOSITY) -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(ZIPJAR_EXCLUDE) $(CHECKZIPRESULT) .ENDIF diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk index 1f6a50347b79..054dcc5fbaff 100644 --- a/solenv/inc/tg_java.mk +++ b/solenv/inc/tg_java.mk @@ -42,13 +42,11 @@ $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY: .IF "$(JAVATARGET)"!="" .IF "$(PACKAGE)"!="" -$(CLASSDIR)/$(IDLPACKAGE)/%.class .NOINFER .IGNORE : %.java -# echo $@ - @@-$(RM) $(JAVATARGET) +$(CLASSDIR)/$(PACKAGE)/%.class .NOINFER .IGNORE : %.java + $(COMMAND_ECHO)-$(RM) $(JAVATARGET) .ELSE # "$(PACKAGE)"!="" $(CLASSDIR)/%.class .NOINFER .IGNORE : %.java -# echo $@ - @@-$(RM) $(JAVATARGET) + $(COMMAND_ECHO)-$(RM) $(JAVATARGET) .ENDIF # "$(PACKAGE)"!="" $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) @@ -78,7 +76,6 @@ $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) @@-find $(CLASSDIR) -type d -user $(USER) \! -perm -5 -print | xargs chmod a+r $$1 .ENDIF .ENDIF - @echo > $@ + @$(TOUCH) $@ .ENDIF # "$(JAVATARGET)"!="" - diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 913608e01db1..0b1659a28796 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -30,22 +30,6 @@ .IF "$(RESLIB$(TNR)TARGETN)"!="" -.IF "$(BUILDHIDS)"!="" -HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB$(TNR)NAME)_res.hid - -#HACK cut off the dirty srs files which are included from solver -RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES))) -$(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES) - @echo "Making: " $(@:f) - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) -# need to strip since solaris cannot handle tab-only whitespace here - $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDRES$(TNR)PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" - $(RSC_MULTI$(TNR)) : \ $(RESLIB$(TNR)SRSFILES) \ $(RESLIB$(TNR)TARGETN) \ diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk index fd970deaae18..0033dd9a76be 100644 --- a/solenv/inc/tg_scp.mk +++ b/solenv/inc/tg_scp.mk @@ -36,7 +36,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COMMAND_ECHO)$(COPY) $< $@ -LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) +LOCALSCP$(TNR)FILES+=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES) @echo "Making: " $(@:f) diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk index a515fc1ed13a..66b8c89850b8 100644 --- a/solenv/inc/tg_sdi.mk +++ b/solenv/inc/tg_sdi.mk @@ -29,15 +29,6 @@ # instructions for ??? # unroll begin -.IF "$(HIDSID$(TNR)PARTICLE)"!="" -$(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET) - @echo "Making: " $(@:f) - @-$(RM) $@.$(ROUT).tmp $@ - @$(TYPE) $(MISC)/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp - @-$(RM) $@ - @$(RENAME) $@.$(ROUT).tmp $@ -.ENDIF # "$(HIDSID$(TNR)PARTICLE)"!="" - .IF "$(SDI$(TNR)TARGET)"!="" $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi @echo "Making: " $(@:f) diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 30e12faeccad..cd02492d825a 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -362,7 +362,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -386,7 +386,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ - ) $(LINKOUTPUTFILTER) + ) # double check if target was really written... still making sense? @@$(LS) $@ @echo linking $@.manifest ... @@ -469,8 +469,10 @@ $(SHL$(TNR)TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL$(TNR)RPATH) $@ +.IF "$(SHL$(TNR)CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL$(TNR)CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL$(TNR)NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN) @@ -556,7 +558,6 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)STDLIBS:^"-l") \ $(SHL$(TNR)LINKRES) \ $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l") \ - $(LINKOUTPUTFILTER) @$(LS) $@ >& $(NULLDEV) .ENDIF # "$(USE_DEFFILE)"!="" @@ -567,16 +568,6 @@ $(SHL$(TNR)TARGETN) : \ .ENDIF # "$(GUI)" == "OS2" - -.IF "$(TESTDIR)"!="" -.IF "$(NO_TESTS)"=="" - -ALLTAR : runtest_$(SHL$(TNR)TARGET) - -runtest_$(SHL$(TNR)TARGET) : $(SHL$(TNR)TARGETN) - testshl $(SHL$(TNR)TARGETN) sce/$(SHL$(TNR)TARGET).sce -msg -skip -.ENDIF # "$(NO_TESTS)"=="" -.ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL$(TNR)TARGETN)"!="" # unroll end diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk index 4e70eb06b1b4..a919069cd3cd 100644 --- a/solenv/inc/tg_srs.mk +++ b/solenv/inc/tg_srs.mk @@ -29,22 +29,10 @@ # unroll begin .IF "$(SRS$(TNR)NAME)"!="" -.IF "$(BUILDHIDS)"!="" -HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)/$(i:s/.src/.hid/)) -HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS$(TNR)NAME)_srs.hid -$(HIDSRS$(TNR)PARTICLE) : $(HID$(TNR)FILES) - @echo "Making: " $(@:f) - @-$(RM) $@ - $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp - @$(RENAME) $@.$(ROUT).tmp $@ - -ALLTAR : $(HIDSRS$(TNR)PARTICLE) - -.ENDIF # "$(BUILDHIDS)"!="" $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) +$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) @echo "Making: " $(@:f) @@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES) diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 17c7c03a6c62..f54918b78b0c 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -127,6 +127,12 @@ GNUTAR*=gtar DEREFERENCE=-L .ELSE # "$(OS)"=="SOLARIS" AWK*=awk +# this is not true, as BSD does not default to a GNU cp, but BSD cp +# so in dmake makefiles one should be restricted to use the subset +# of features that both BSD and GNU make support. +# as the GNU make build system requires GNUCOPY to really be a GNU copy +# we work around that for now by not setting GNUCOPY in sdev300.ini +# for fbsd for now, but for all other platforms it is set. GNUCOPY*=cp GNUPATCH*=patch DEREFERENCE=-L diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 5733e026f566..cecb6f319f40 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -203,6 +203,9 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR) KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE KDE_LIBS:=-lkdeui -lkdecore -lqt-mt SOLARLIB+=-L$(KDE_ROOT)/lib +.IF "$(OS)$(CPU)" == "LINUXX" +SOLARLIB+=-L$(KDE_ROOT)/lib64 +.ENDIF # "$(OS)$(CPU)" == "LINUXX" .ENDIF # "$(KDE_ROOT)"!="" .ENDIF # "$(ENABLE_KDE)" != "" diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 134395567966..99beaa797626 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -45,8 +45,9 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI # unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk # (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro) # http://developer.apple.com/technotes/tn2002/tn2064.html -MACOSX_DEPLOYMENT_TARGET=10.4 -.EXPORT: MACOSX_DEPLOYMENT_TARGET +# done in setsolar/configure now. left here for documentation +#MACOSX_DEPLOYMENT_TARGET=10.4 +#.EXPORT: MACOSX_DEPLOYMENT_TARGET CDEFS+=-DQUARTZ EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk .ENDIF diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc index c098be0ccad8..344abbe07fad 100755 --- a/solenv/inc/version.hrc +++ b/solenv/inc/version.hrc @@ -25,21 +25,11 @@ * *************************************************************************/ -#define VERSION 3 -#define SUBVERSION 3 +#include "versionlist.hrc" + //#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) -// .0 + VER_CONCEPT -// .100 + VER_ALPHA -// .200 + VER_BETA -// .300 + VER_GAMMA -// .500 + VER_FINAL -//#define VER_CONCEPT 0 -//#define VER_BETA 6 -#define VER_FINAL 0 -#define VER_DAY 1 -#define VER_MONTH 8 -#define VER_YEAR 2010 +#define VER_FINAL 0 #ifndef VER_FIRSTYEAR #define VER_FIRSTYEAR VER_YEAR diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst index ac49f6c6fcf6..200cdf53e924 100644..100755 --- a/solenv/inc/version.lst +++ b/solenv/inc/version.lst @@ -26,5 +26,9 @@ #************************************************************************* OOOBASEVERSIONMAJOR=3 -OOOBASEVERSIONMINOR=3 +OOOBASEVERSIONMINOR=4 OOOBASEVERSIONMICRO=0 + +OOOBASEVERSIONDAY=1 +OOOBASEVERSIONMONTH=10 +OOOBASEVERSIONYEAR=2010 diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc index b7e95397b091..2e4db98a2925 100755 --- a/solenv/inc/version_so.hrc +++ b/solenv/inc/version_so.hrc @@ -25,21 +25,11 @@ * *************************************************************************/ -#define VERSION 3 -#define SUBVERSION 3 +#include "versionlist.hrc" + //#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) -// .0 + VER_CONCEPT -// .100 + VER_ALPHA -// .200 + VER_BETA -// .300 + VER_GAMMA -// .500 + VER_FINAL -//#define VER_CONCEPT 0 -//#define VER_BETA 6 -#define VER_FINAL 0 -#define VER_DAY 1 -#define VER_MONTH 8 -#define VER_YEAR 2010 +#define VER_FINAL 0 #ifndef VER_FIRSTYEAR #define VER_FIRSTYEAR VER_YEAR diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk index 31a255e48be1..672df7bd7602 100644..100755 --- a/solenv/inc/versionlist.mk +++ b/solenv/inc/versionlist.mk @@ -27,4 +27,4 @@ .INCLUDE: version.lst -.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO +.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO OOOBASEVERSIONDAY OOOBASEVERSIONMONTH OOOBASEVERSIONYEAR diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 73f33998cc7b..531b4baef719 100755 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -85,7 +85,7 @@ CDEFS+=-D_DLL # -Wshadow does not work for C with nested uses of pthread_cleanup_push: CFLAGSWARNCC=-Wall -Wextra -Wendif-labels CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor -Wno-uninitialized + -Wno-non-virtual-dtor CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) CFLAGSWERRCC=-Werror @@ -127,7 +127,7 @@ LINKFLAGSDEBUG=-g LINKFLAGSOPT= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!="" -STDLIBCPP=-lstdc++_s +STDLIBCPP=$(MINGW_SHARED_LIBSTDCPP) .ELSE STDLIBCPP=-lstdc++ .ENDIF diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 2138405a6b9a..1276f773e336 100644..100755 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -232,13 +232,12 @@ _VC_MANIFEST_BASENAME=__VC90 .ENDIF .IF "$(CL_X64)" == "" -LINK=link /MACHINE:IX86 +LINK=link /MACHINE:IX86 /IGNORE:4102 /IGNORE:4197 .ELSE LINK=link /MACHINE:X64 .ENDIF # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with # a return value 1, which makes dmake think it failed -LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:" .IF "$(PRODUCT)"!="full" .ELSE LINKFLAGS=/MAP /OPT:NOREF |