diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-16 18:11:49 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-16 18:11:49 +0000 |
| commit | c6b61710c44abd1b8dda1f3e3736fe6bc19ac1b4 (patch) | |
| tree | d990c49a20ae6f5875301357fc9f69c4dc057ca8 | |
| parent | 4dd442010398f4d280ebaa1de3d066185da00daf (diff) | |
CWS-TOOLING: integrate CWS ause102
2009-06-16 19:22:59 +0200 hjs r273039 : #i102607# don't kill mingw
2009-06-12 15:17:22 +0200 ihi r272921 : #i102607# add path before calling l10n tool
2009-06-11 14:25:20 +0200 hjs r272873 : #i102607# on EPM=internal call binary with full path
2009-06-10 13:35:48 +0200 hjs r272807 : #i102607# remove solver PATH entry from OOo env.
2009-06-10 12:10:44 +0200 hjs r272802 : #i102635# correct dependencies for all
2009-06-10 11:58:53 +0200 hjs r272801 : #i102607# call tools from solver with absolute path
| -rwxr-xr-x | helpcontent2/makefile.pmk | 2 | ||||
| -rwxr-xr-x | helpcontent2/util/target.pmk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk index ca7843556d..d47e0ae66c 100755 --- a/helpcontent2/makefile.pmk +++ b/helpcontent2/makefile.pmk @@ -44,7 +44,7 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES) .IF "$(WITH_LANG)"!="" - @$(AUGMENT_LIBRARY_PATH) helpex -QQ -p helpcontent2 -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 localize.sdf && $(TOUCH) $@ + @$(HELPEX) -QQ -p helpcontent2 -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 localize.sdf && $(TOUCH) $@ .ELSE # "$(WITH_LANG)"!="" .IF "$(USE_SHELL)"=="4nt" # it's getting real ugly... diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index 6b34104ba8..b126013457 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -39,7 +39,7 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) .ENDIF $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst - $(AUGMENT_LIBRARY_PATH) $(WRAPCMD) HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) + $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@) .IF "$(SOLAR_JAVA)" == "TRUE" $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexer -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ .ELSE |