diff options
author | Dirk Voelzke <dv@openoffice.org> | 2010-11-01 10:49:06 +0100 |
---|---|---|
committer | Dirk Voelzke <dv@openoffice.org> | 2010-11-01 10:49:06 +0100 |
commit | 116c20c746e6afccbfc0a25c81b9ac10db394454 (patch) | |
tree | d49fd2bba2d4fd31a599107edc6c783dbd512937 /solenv/inc | |
parent | 13a3e991825849c851e626cdbec0b40bb8161263 (diff) | |
parent | 213c9f9662001c25bf37b8e35ec779a39b764d8e (diff) |
dv22: merge with DEV300_m91
Diffstat (limited to 'solenv/inc')
-rw-r--r-- | solenv/inc/_tg_rslb.mk | 160 | ||||
-rw-r--r-- | solenv/inc/_tg_sdi.mk | 90 | ||||
-rw-r--r-- | solenv/inc/_tg_srs.mk | 140 | ||||
-rw-r--r-- | solenv/inc/extension_helplink.mk | 80 | ||||
-rw-r--r-- | solenv/inc/extension_post.mk | 4 | ||||
-rw-r--r-- | solenv/inc/installationtest.mk | 15 | ||||
-rw-r--r-- | solenv/inc/libs.mk | 2 | ||||
-rw-r--r-- | solenv/inc/minor.mk | 6 | ||||
-rw-r--r-- | solenv/inc/postset.mk | 3 | ||||
-rw-r--r-- | solenv/inc/rules.mk | 7 | ||||
-rw-r--r-- | solenv/inc/settings.mk | 23 | ||||
-rw-r--r-- | solenv/inc/target.mk | 58 | ||||
-rw-r--r--[-rwxr-xr-x] | solenv/inc/tg_help.mk | 30 | ||||
-rw-r--r-- | solenv/inc/tg_rslb.mk | 16 | ||||
-rw-r--r-- | solenv/inc/tg_sdi.mk | 9 | ||||
-rw-r--r-- | solenv/inc/tg_srs.mk | 14 | ||||
-rwxr-xr-x | solenv/inc/tg_xmerge.mk | 17 | ||||
-rw-r--r-- | solenv/inc/unxlng.mk | 5 |
18 files changed, 168 insertions, 511 deletions
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk index 273ac8dabe1b..4c67a1d58c97 100644 --- 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_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_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/extension_helplink.mk b/solenv/inc/extension_helplink.mk new file mode 100644 index 000000000000..e375696bda18 --- /dev/null +++ b/solenv/inc/extension_helplink.mk @@ -0,0 +1,80 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/HelpIndexerTool.jar$ + +.IF "$(SYSTEM_LUCENE)" == "YES" +my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) +.ELSE +my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar +.ENDIF + +.IF "$(SYSTEM_DB)" != "YES" +JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) +.ENDIF + +#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso*:=$(alllangiso) + +######################################################### + + +HELPLINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(MISC)/$(TARGET)_$(LINKNAME)_$i.done) +HELPLINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES))) + +ALLTAR : $(HELPLINKALLTARGETS) + +.IF "$(SYSTEM_DB)" != "YES" +JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) +.ENDIF + +XSL_DIR*:=$(SOLARBINDIR) +XHPLINKSRC*:=$(XHPDEST) +STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl + +.IF "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" +$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(HELP_OUT)/$(TARGET).done +LINKDEPS+=$(HELP_OUT)/xhp_changed.flag +.ENDIF # "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" + +$(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKDEPS)) + @echo Building help index for $(@:b:s/_/./:e:s/.//) + $(COMMAND_ECHO)$(HELPLINKER) -mod $(LINKNAME) -extlangsrc $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} $(STY_SWITCH) -extlangdest $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl $(LINKLINKFILES) + $(COMMAND_ECHO)cd $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && zip -u -r $(LINKNAME).jar $(PACKAGE)/* $(CHECKZIPRESULT) +.IF "$(SOLAR_JAVA)" == "TRUE" +# cleanup index dir + -$(RM) $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))}/$(LINKNAME).idxl/* +.IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == "" + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && $(TOUCH) $@ +.ELSE + $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -checkcfsandsegname _0 _3 && $(TOUCH) $@ +.ENDIF +.ELSE + -$(RM) $(XHPLINKSRC)/$(@:b)/content/*.* + -$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.* +.ENDIF + diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index 47b62d20dd12..f221ff7ebe4a 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -39,7 +39,11 @@ fixme4=$(fixme:n) $(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu # ugly hacking to workaround prepended first source path @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d)) +.IF "$(COMPONENT_XCU_REPLACEMENT)"!="" + $(TYPE) $< | sed '$(COMPONENT_XCU_REPLACEMENT)' > $(subst,$(fixme2),$(MISC) $@) +.ELSE # "$(COMPONENT_REPLACEMENT)"!="" $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@) +.ENDIF # "$(COMPONENT_REPLACEMENT)"!="" $(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d)) diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 6806e15c69e7..8540140d1533 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -89,26 +89,20 @@ $(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) + $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") $(CPPTEST_LIBRARY) $(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) $(RM) -r $(MISC)/$(TARGET)/user @@ -117,7 +111,8 @@ javatest .PHONY : $(JAVATARGET) '$(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/libs.mk b/solenv/inc/libs.mk index 09b6df9d33d9..4f7ffbf40851 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -354,6 +354,7 @@ LPSOLVELIB=-llpsolve55 SOFFICELIB=-lsofficeapp UNOPKGAPPLIB=-lunopkgapp TESTLIB=-ltest +XMLREADERLIB=-lxmlreader .ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -535,5 +536,6 @@ LPSOLVELIB=lpsolve55.lib SOFFICELIB=isofficeapp.lib UNOPKGAPPLIB=iunopkgapp.lib TESTLIB=itest.lib +XMLREADERLIB=ixmlreader.lib .ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index dccfa1008d68..a2e06a2dd244 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m87(Build:9522) -BUILD=9522 -LAST_MINOR=m87 +RSCREVISION=300m91(Build:9538) +BUILD=9538 +LAST_MINOR=m91 SOURCEVERSION=DEV300 diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index 77413849c5f9..f16ccb554fc5 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -25,7 +25,6 @@ # #************************************************************************* - # Default ISO code used when no languages specified # This language will be always included! defaultlangiso=en-US @@ -118,6 +117,7 @@ sa-IN \ si \ sc \ sd \ +sq \ sk \ sl \ sh \ @@ -129,6 +129,7 @@ sw \ sw-TZ \ te-IN \ ti-ER \ +ta \ ta-IN \ th \ tn \ diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 7ad8fd19f33f..2155ab8842d5 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 c73fe6925df3..41cbcbd5624b 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1013,15 +1013,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 +# 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 ": &&" 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: 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 # remove if .Net 2003 support has expired @@ -1349,6 +1349,19 @@ 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/ + # 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_help.mk b/solenv/inc/tg_help.mk index 89f1ebabec6c..cce5b9ee62b2 100755..100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk @@ -31,23 +31,31 @@ aux_alllangiso*:=$(alllangiso) SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) -HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) -ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix +.IF "$(XHPDEST)"=="" +XHPDEST*:=$(COMMONMISC) +HELP_OUT:=$(COMMONMISC) +.ELSE # "$(XHPDEST)"=="" +HELP_OUT:=$(MISC) +.ENDIF # "$(XHPDEST)"=="" + +HLANGXHPFILES*:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) + +ALLTAR : $(HELP_OUT)$/$(TARGET).done $(HELP_OUT)$/xhp_changed.flag optix $(HLANGXHPFILES) : $$(@:d)thisdir.created -$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp +$(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp @$(TOUCH) $@ # internal dependencies not sufficient to trigger merge? # @$(NULL) -$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) +$(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES) .IF "$(WITH_LANG)"!="" - $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ + $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@ .ELSE # "$(WITH_LANG)"!="" - cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ + cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@ .ENDIF # "$(WITH_LANG)"!="" .IF "$(OS)"=="SOLARIS" @$(ECHONL) " " @@ -55,24 +63,24 @@ $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) @$(ECHONL) .ENDIF # "$(OS)"=="SOLARIS" -$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES) +$(HELP_OUT)$/xhp_changed.flag : $(HLANGXHPFILES) @$(TOUCH) $@ # urks - dmake mixes up operators and strings :-( .IF "$(HLANGXHPFILES:s/defined/xxx/)"!="" .IF "$(HELPTRANSPHONY)"!="" -$(COMMONMISC)$/$(TARGET).done .PHONY : +$(HELP_OUT)$/$(TARGET).done .PHONY : .ELSE # "$(HELPTRANSPHONY)"!="" -$(COMMONMISC)$/$(TARGET).done : makefile.mk +$(HELP_OUT)$/$(TARGET).done : makefile.mk .IF "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF) +$(HELP_OUT)$/$(TARGET).done : $(LOCALIZESDF) .ENDIF # "$(WITH_LANG)"!="" .ENDIF # "$(HELPTRANSPHONY)"!="" .ENDIF # "$(HLANGXHPFILES)"!="" -optix: $(COMMONMISC)$/$(TARGET).done +optix: $(HELP_OUT)$/$(TARGET).done @echo done %.created : diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 40096386c436..69721a7e2204 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_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_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/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk index fa3e2297184f..6ff412bb022f 100755 --- a/solenv/inc/tg_xmerge.mk +++ b/solenv/inc/tg_xmerge.mk @@ -27,33 +27,32 @@ .IF "$(XTXFILES)"!="" -ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES) +L10NEXT*=.txt +XTX_TARGET_PATH*=$(MISC)/$(TARGET) -.IF "$(L10NEXT)"=="" -L10NEXT:=.txt -.ENDIF +ALLTAR : $(XTX_TARGET_PATH).xtx.pmerge.mk $(XTXFILES) -$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXFILES) +$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXFILES) $(XTXFILES) : $(LOCALIZESDF) -.INCLUDE .IGNORE : $(MISC)/$(TARGET).xtx.pmerge.mk +.INCLUDE .IGNORE : $(XTX_TARGET_PATH).xtx.pmerge.mk .IF "$(alllangiso)"!="$(last_merge)" XTXMERGEPHONY:=.PHONY .ENDIF # "$(alllangiso)" != "$(last_merge)" -$(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx +$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx @@-$(MKDIRHIER) $(@:d) .IF "$(WITH_LANG)"=="" - $(COMMAND_ECHO)$(COPY) $< $@ + $(COMMAND_ECHO)$(COPY) $< $(@:d)$(@:b)_en-US$(L10NEXT) .ELSE # "$(WITH_LANG)"=="" @@-$(RM) $@ $(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f)) $(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d)) .ENDIF # "$(WITH_LANG)"=="" -$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXMERGELIST) +$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXMERGELIST) .IF "$(WITH_LANG)"!="" # xtxex command file requirements: # - one file per line diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index aff552dde89c..1ca4faa34402 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -65,7 +65,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=--sysroot=$(SYSBASE) CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -153,8 +153,7 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$O LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' LINKFLAGSRUNPATH_NONE= -# flag -Wl,-z,noexecstack sets the NX bit on the stack -LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) +LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo .ENDIF |