Author: jani Date: Thu Oct 3 20:13:41 2013 New Revision: 1528992 URL: http://svn.apache.org/r1528992 Log: solved genPO extract conflict with 2 makefiles solved transex3 rename/delete problem added helpIndexer back
Modified: openoffice/branches/l10n40/main/l10ntools/prj/build.lst openoffice/branches/l10n40/main/l10ntools/prj/d.lst openoffice/branches/l10n40/main/linguistic/qa/unoapi/makefile.mk openoffice/branches/l10n40/main/qadevOOo/qa/unoapi/makefile.mk openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk openoffice/branches/l10n40/main/solenv/inc/target.mk openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk Modified: openoffice/branches/l10n40/main/l10ntools/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/prj/build.lst?rev=1528992&r1=1528991&r2=1528992&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/prj/build.lst (original) +++ openoffice/branches/l10n40/main/l10ntools/prj/build.lst Thu Oct 3 20:13:41 2013 @@ -1,3 +1,4 @@ -tr l10ntools : solenv soltools NULL -tr l10ntools usr1 - all tr_mkout NULL -tr l10ntools\source nmake - all tr_mkout NULL +tr l10ntools :solenv soltools NULL +tr l10ntools usr1 - all tr_mkout NULL +tr l10ntools\source nmake - all tr_src NULL +tr l10ntools\source\help nmake - all tr_help NULL Modified: openoffice/branches/l10n40/main/l10ntools/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/prj/d.lst?rev=1528992&r1=1528991&r2=1528992&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/prj/d.lst (original) +++ openoffice/branches/l10n40/main/l10ntools/prj/d.lst Thu Oct 3 20:13:41 2013 @@ -1,4 +1,19 @@ mkdir: %_DEST%\bin%_EXT% +mkdir: %_DEST%\bin%_EXT%\help +mkdir: %_DEST%\bin%_EXT%\help\com +mkdir: %_DEST%\bin%_EXT%\help\com\sun +mkdir: %_DEST%\bin%_EXT%\help\com\sun\star +mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help ..\%__SRC%\bin\genLang %_DEST%\bin%_EXT%\genLang -..\%__SRC%\bin\genLang.exr %_DEST%\bin%_EXT%\genLang.exe +..\%__SRC%\bin\genLang.exe %_DEST%\bin%_EXT%\genLang.exe + +..\%__SRC%\class\FCFGMerge.jar %_DEST%\bin%_EXT%\FCFGMerge.jar +..\%__SRC%\class\HelpIndexerTool.jar %_DEST%\bin%_EXT%\HelpIndexerTool.jar +..\%__SRC%\class\jpropex\jpropex.jar %_DEST%\bin%_EXT%\jpropex.jar +..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker +..\%__SRC%\bin\HelpCompiler %_DEST%\bin%_EXT%\HelpCompiler +..\%__SRC%\bin\HelpCompiler.exe %_DEST%\bin%_EXT%\HelpCompiler.exe +..\%__SRC%\bin\HelpLinker.exe %_DEST%\bin%_EXT%\HelpLinker.exe +..\%__SRC%\bin\HelpLink* %_DEST%\bin%_EXT% + Modified: openoffice/branches/l10n40/main/linguistic/qa/unoapi/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/linguistic/qa/unoapi/makefile.mk?rev=1528992&r1=1528991&r2=1528992&view=diff ============================================================================== --- openoffice/branches/l10n40/main/linguistic/qa/unoapi/makefile.mk (original) +++ openoffice/branches/l10n40/main/linguistic/qa/unoapi/makefile.mk Thu Oct 3 20:13:41 2013 @@ -22,7 +22,7 @@ .IF "$(OOO_SUBSEQUENT_TESTS)" == "" -.INCLUDE: target.mk +genPO: .ELSE PRJ = ../.. Modified: openoffice/branches/l10n40/main/qadevOOo/qa/unoapi/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/qadevOOo/qa/unoapi/makefile.mk?rev=1528992&r1=1528991&r2=1528992&view=diff ============================================================================== --- openoffice/branches/l10n40/main/qadevOOo/qa/unoapi/makefile.mk (original) +++ openoffice/branches/l10n40/main/qadevOOo/qa/unoapi/makefile.mk Thu Oct 3 20:13:41 2013 @@ -22,7 +22,7 @@ .IF "$(OOO_SUBSEQUENT_TESTS)" == "" -.INCLUDE: target.mk +genPO: .ELSE PRJ = ../.. Modified: openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk?rev=1528992&r1=1528991&r2=1528992&view=diff ============================================================================== --- openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk (original) +++ openoffice/branches/l10n40/main/solenv/inc/_tg_srs.mk Thu Oct 3 20:13:41 2013 @@ -78,8 +78,6 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST) @@ -120,8 +118,6 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST) @@ -162,8 +158,6 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST) @@ -204,8 +198,6 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST) @@ -246,8 +238,6 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST) @@ -288,8 +278,6 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST) @@ -330,8 +318,6 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST) @@ -372,8 +358,6 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST) @@ -414,8 +398,6 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)/ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST) Modified: openoffice/branches/l10n40/main/solenv/inc/target.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/target.mk?rev=1528992&r1=1528991&r2=1528992&view=diff ============================================================================== --- openoffice/branches/l10n40/main/solenv/inc/target.mk (original) +++ openoffice/branches/l10n40/main/solenv/inc/target.mk Thu Oct 3 20:13:41 2013 @@ -1495,7 +1495,7 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ $(COMMAND_ECHO)-$(RM) $@ $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@ +# $(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@ .ENDIF # "$(WITH_LANG)"=="" .ENDIF # "$(LOCALIZE_ME_DEST)"!="" Modified: openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk?rev=1528992&r1=1528991&r2=1528992&view=diff ============================================================================== --- openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk (original) +++ openoffice/branches/l10n40/main/solenv/inc/tg_srs.mk Thu Oct 3 20:13:41 2013 @@ -42,8 +42,6 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMI $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(SOLARBINDIR)/genLang merge $(PRJNAME) $(SRC_ROOT)/languages/source "$(WITH_LANG)" -t $(COMMONMISC)/$(TARGET) -v -f $< # $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all - $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@ - $(COMMAND_ECHO)-$(RM) $@.$(INPATH) $(SRS)/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)