Author: jani Date: Sun Aug 4 10:43:20 2013 New Revision: 1510129 URL: http://svn.apache.org/r1510129 Log: cleaned l10ntools, all old tools removed
Removed: openoffice/branches/l10n40/main/l10ntools/inc/ openoffice/branches/l10n40/main/l10ntools/java/ openoffice/branches/l10n40/main/l10ntools/layout/ openoffice/branches/l10n40/main/l10ntools/scripts/fast_merge.pl openoffice/branches/l10n40/main/l10ntools/scripts/keyidGen.pl openoffice/branches/l10n40/main/l10ntools/scripts/localize.pl openoffice/branches/l10n40/main/l10ntools/scripts/localize_old.pl openoffice/branches/l10n40/main/l10ntools/scripts/makefile.mk openoffice/branches/l10n40/main/l10ntools/scripts/tool/ openoffice/branches/l10n40/main/l10ntools/scripts/xhtex openoffice/branches/l10n40/main/l10ntools/scripts/xtxex openoffice/branches/l10n40/main/l10ntools/source/cfg_yy_wrapper.c openoffice/branches/l10n40/main/l10ntools/source/cfglex.l openoffice/branches/l10n40/main/l10ntools/source/cfgmerge.cxx openoffice/branches/l10n40/main/l10ntools/source/directory.cxx openoffice/branches/l10n40/main/l10ntools/source/export.cxx openoffice/branches/l10n40/main/l10ntools/source/export2.cxx openoffice/branches/l10n40/main/l10ntools/source/file.cxx openoffice/branches/l10n40/main/l10ntools/source/filter/ openoffice/branches/l10n40/main/l10ntools/source/gsicheck.cxx openoffice/branches/l10n40/main/l10ntools/source/gsiconv.cxx openoffice/branches/l10n40/main/l10ntools/source/help/ openoffice/branches/l10n40/main/l10ntools/source/helpex.cxx openoffice/branches/l10n40/main/l10ntools/source/helpmerge.cxx openoffice/branches/l10n40/main/l10ntools/source/inireader.cxx openoffice/branches/l10n40/main/l10ntools/source/lngex.cxx openoffice/branches/l10n40/main/l10ntools/source/lngmerge.cxx openoffice/branches/l10n40/main/l10ntools/source/localize.cxx openoffice/branches/l10n40/main/l10ntools/source/merge.cxx openoffice/branches/l10n40/main/l10ntools/source/src_yy_wrapper.c openoffice/branches/l10n40/main/l10ntools/source/srciter.cxx openoffice/branches/l10n40/main/l10ntools/source/srclex.l openoffice/branches/l10n40/main/l10ntools/source/tagtest.cxx openoffice/branches/l10n40/main/l10ntools/source/treeconfig.cxx openoffice/branches/l10n40/main/l10ntools/source/utf8conv.cxx openoffice/branches/l10n40/main/l10ntools/source/wtranode.cxx openoffice/branches/l10n40/main/l10ntools/source/wtratree.cxx openoffice/branches/l10n40/main/l10ntools/source/xgfconv.cxx openoffice/branches/l10n40/main/l10ntools/source/xmlparse.cxx openoffice/branches/l10n40/main/l10ntools/source/xrm_yy_wrapper.c openoffice/branches/l10n40/main/l10ntools/source/xrmlex.l openoffice/branches/l10n40/main/l10ntools/source/xrmmerge.cxx openoffice/branches/l10n40/main/l10ntools/workbench/ Modified: openoffice/branches/l10n40/main/l10ntools/prj/build.lst openoffice/branches/l10n40/main/l10ntools/prj/d.lst openoffice/branches/l10n40/main/l10ntools/source/makefile.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=1510129&r1=1510128&r2=1510129&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/prj/build.lst (original) +++ openoffice/branches/l10n40/main/l10ntools/prj/build.lst Sun Aug 4 10:43:20 2013 @@ -1,10 +1,3 @@ -tr l10ntools : tools LIBXSLT:libxslt LUCENE:lucene PYTHON:python NULL -tr l10ntools usr1 - all tr_mkout NULL -tr l10ntools\inc nmake - all tr_inc NULL -tr l10ntools\scripts nmake - all tr_scripts NULL -tr l10ntools\source nmake - all tr_src tr_inc NULL -tr l10ntools\layout nmake - all rt_layout tr_src tr_inc NULL -tr l10ntools\java\jpropex nmake - all tr_blah NULL -tr l10ntools\source\help nmake - all tr_bla_help NULL -tr l10ntools\source\filter\utils nmake - all tr_bla_utils NULL -tr l10ntools\source\filter\merge nmake - all tr_bla_merge tr_bla_utils NULL +tr l10ntools : NULL +tr l10ntools usr1 - all tr_mkout NULL +tr l10ntools\source nmake - all tr_src tr_inc 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=1510129&r1=1510128&r2=1510129&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/prj/d.lst (original) +++ openoffice/branches/l10n40/main/l10ntools/prj/d.lst Sun Aug 4 10:43:20 2013 @@ -1,80 +1,4 @@ -mkdir: %_DEST%\inc%_EXT%\l10ntools 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\X40cfgex.exe %_DEST%\bin%_EXT%\X40cfgex.exe -..\%__SRC%\bin\X40cfgex %_DEST%\bin%_EXT%\X40cfgex -..\%__SRC%\bin\X40transex3.exe %_DEST%\bin%_EXT%\X40transex3.exe -..\%__SRC%\bin\X40transex3 %_DEST%\bin%_EXT%\X40transex3 -#..\%__SRC%\bin\X40lngex.exe %_DEST%\bin%_EXT%\X40lngex.exe -#..\%__SRC%\bin\X40lngex %_DEST%\bin%_EXT%\X40lngex -..\%__SRC%\bin\X40localize_sl.exe %_DEST%\bin%_EXT%\X40localize_sl.exe -..\%__SRC%\bin\X40localize_sl %_DEST%\bin%_EXT%\X40localize_sl -..\%__SRC%\bin\X40xrmex.exe %_DEST%\bin%_EXT%\X40xrmex.exe -..\%__SRC%\bin\X40xrmex %_DEST%\bin%_EXT%\X40xrmex -..\%__SRC%\bin\X40gsicheck.exe %_DEST%\bin%_EXT%\X40gsicheck.exe -..\%__SRC%\bin\X40gsicheck %_DEST%\bin%_EXT%\X40gsicheck -..\%__SRC%\bin\X40helpex.exe %_DEST%\bin%_EXT%\X40helpex.exe -..\%__SRC%\bin\X40helpex %_DEST%\bin%_EXT%\X40helpex -..\%__SRC%\bin\X40ulfex.exe %_DEST%\bin%_EXT%\X40ulfex.exe -..\%__SRC%\bin\X40ulfex %_DEST%\bin%_EXT%\X40ulfex -#..\%__SRC%\bin\X40txtconv.exe %_DEST%\bin%_EXT%\X40txtconv.exe -#..\%__SRC%\bin\X40txtconv %_DEST%\bin%_EXT%\X40txtconv -..\%__SRC%\bin\X40tralay.exe %_DEST%\bin%_EXT%\X40tralay.exe -..\%__SRC%\bin\X40tralay %_DEST%\bin%_EXT%\X40tralay -#..\%__SRC%\bin\X40ulfconv %_DEST%\bin%_EXT%\X40ulfconv -..\%__SRC%\class\X40FCFGMerge.jar %_DEST%\bin%_EXT%\X40FCFGMerge.jar -..\%__SRC%\class\X40HelpIndexerTool.jar %_DEST%\bin%_EXT%\X40HelpIndexerTool.jar -..\%__SRC%\class\jpropex\X40jpropex.jar %_DEST%\bin%_EXT%\X40jpropex.jar -..\%__SRC%\bin\X40HelpLinker %_DEST%\bin%_EXT%\X40HelpLinker -..\%__SRC%\bin\X40HelpLinker.exe %_DEST%\bin%_EXT%\X40HelpLinker.exe -#..\%__SRC%\bin\X40HelpCompiler %_DEST%\bin%_EXT%\X40HelpCompiler -#..\%__SRC%\bin\X40HelpCompiler.exe %_DEST%\bin%_EXT%\X40HelpCompiler.exe -#..\%__SRC%\bin\X40HelpLink* %_DEST%\bin%_EXT% - -..\%__SRC%\class\converter\X40converter.jar %_DEST%\bin%_EXT%\X40converter.jar -..\%__SRC%\doc\X40converter_javadoc.zip %_DEST%\bin%_EXT%\X40converter_javadoc.zip - -..\%__SRC%\class\receditor\X40receditor.jar %_DEST%\bin%_EXT%\X40receditor.jar - -..\java\jpropex\X40jpropex %_DEST%\bin%_EXT%\X40jpropex -..\scripts\localize.pl %_DEST%\bin%_EXT%\X40localize.pl -..\scripts\localize_old.pl %_DEST%\bin%_EXT%\X40localize_old.pl -..\scripts\localize %_DEST%\bin%_EXT%\X40localize -..\scripts\fast_merge.pl %_DEST%\bin%_EXT%\X40fast_merge.pl -..\scripts\keyidGen.pl %_DEST%\bin%_EXT%\X40keyidGen.pl -..\scripts\xtxex %_DEST%\bin%_EXT%\X40xtxex -..\scripts\xhtex %_DEST%\bin%_EXT%\X40xhtex -..\%__SRC%\bin\X40const.py %_DEST%\bin%_EXT%\X40const.py -..\%__SRC%\bin\X40l10ntool.py %_DEST%\bin%_EXT%\X40l10ntool.py -..\%__SRC%\bin\X40pseudo.py %_DEST%\bin%_EXT%\X40pseudo.py -..\%__SRC%\bin\X40sdf.py %_DEST%\bin%_EXT%\X40sdf.py -..\%__SRC%\bin\X40const.pyc %_DEST%\bin%_EXT%\X40const.pyc -..\%__SRC%\bin\X40l10ntool.pyc %_DEST%\bin%_EXT%\X40l10ntool.pyc -..\%__SRC%\bin\X40pseudo.pyc %_DEST%\bin%_EXT%\X40pseudo.pyc -..\%__SRC%\bin\X40sdf.pyc %_DEST%\bin%_EXT%\X40sdf.pyc -..\%__SRC%\bin\X40xhtex.py %_DEST%\bin%_EXT%\X40xhtex.py -..\%__SRC%\bin\X40xtxex.py %_DEST%\bin%_EXT%\X40xtxex.py -..\%__SRC%\bin\X40xhtex.pyc %_DEST%\bin%_EXT%\X40xhtex.pyc -..\%__SRC%\bin\X40xtxex.pyc %_DEST%\bin%_EXT%\X40xtxex.pyc -..\inc\X40export.hxx %_DEST%\inc%_EXT%\l10ntools\X40export.hxx -..\inc\l10ntools\X40directory.hxx %_DEST%\inc%_EXT%\l10ntools\X40directory.hxx -..\inc\l10ntools\X40file.hxx %_DEST%\inc%_EXT%\l10ntools\X40file.hxx -..\inc\l10ntools\X40vosapp.hxx %_DEST%\inc%_EXT%\l10ntools\X40vosapp.hxx -..\source\filter\merge\X40FCFGMerge.cfg %_DEST%\inc%_EXT%\l10ntools\X40FCFGMerge.cfg - -..\inc\X40utf8conv.hxx %_DEST%\inc%_EXT%\l10ntools\X40utf8conv.hxx -..\%__SRC%\lib\X40transex.lib %_DEST%\lib%_EXT%\X40transex.lib -..\%__SRC%\lib\X40libtransex.a %_DEST%\lib%_EXT%\X40libtransex.a - -..\source\help\X40compilehelp.hxx %_DEST%\inc%_EXT%\l10ntools\X40compilehelp.hxx -#..\source\help\X40helplinkerdllapi.h %_DEST%\inc%_EXT%\l10ntools\X40helplinkerdllapi.h -..\%__SRC%\lib\* %_DEST%\lib%_EXT%\* -..\%__SRC%\class\com\sun\star\help\* %_DEST%\bin%_EXT%\help\com\sun\star\help\* ..\%__SRC%\bin\genLang %_DEST%\bin%_EXT%\genLang ..\%__SRC%\bin\genLang.exr %_DEST%\bin%_EXT%\genLang.exe Modified: openoffice/branches/l10n40/main/l10ntools/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/l10ntools/source/makefile.mk?rev=1510129&r1=1510128&r2=1510129&view=diff ============================================================================== --- openoffice/branches/l10n40/main/l10ntools/source/makefile.mk (original) +++ openoffice/branches/l10n40/main/l10ntools/source/makefile.mk Sun Aug 4 10:43:20 2013 @@ -26,7 +26,7 @@ PRJ=.. INCPRE=$(MISC) PRJNAME=l10ntools -TARGET=X40transex +TARGET=genLang TARGETTYPE=CUI LIBTARGET=no # --- Settings ----------------------------------------------------- @@ -43,178 +43,42 @@ CFLAGS+=-DSYSTEM_EXPAT # --- Files -------------------------------------------------------- -OBJFILES= \ - $(OBJ)$/export.obj \ - $(OBJ)$/export2.obj \ - $(OBJ)$/merge.obj \ - $(OBJ)$/srciter.obj \ - $(OBJ)$/utf8conv.obj \ - $(OBJ)$/xmlparse.obj \ - $(OBJ)$/helpmerge.obj \ - $(OBJ)$/helpex.obj \ - $(OBJ)$/file.obj \ - $(OBJ)$/directory.obj - - -LIB1TARGET= $(LB)$/$(TARGET).lib -LIB1ARCHIV= $(LB)$/libtransex.a -#LIB1FILES= $(LB)$/transex3.lib -LIB1OBJFILES= $(OBJ)$/export.obj \ - $(OBJ)$/export2.obj \ - $(OBJ)$/merge.obj \ - $(OBJ)$/srciter.obj \ - $(OBJ)$/file.obj \ - $(OBJ)$/directory.obj \ - $(OBJ)$/utf8conv.obj - - -APP1VERSIONMAP=exports.map - -# extractor and merger for *.src and *.hrc -APP1TARGET= X40transex3 -#APP1OBJS= $(OBJ)$/src_yy.obj -APP1OBJS= $(OBJ)$/src_yy_wrapper.obj - -APP1STDLIBS+= \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - -APP1LIBS+= $(LB)$/$(TARGET).lib -APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib - -APP2TARGET= X40helpex -APP2OBJS= $(OBJ)$/helpmerge.obj $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj -APP2RPATH= NONE - -.IF "$(OS)"!="MACOSX" -.ENDIF - -APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB) - -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - -# extractor and merger for *.lng and *.lng -APP3TARGET= X40ulfex -APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/lngex.obj $(OBJ)$/utf8conv.obj -APP3RPATH= NONE - -.IF "$(OS)"!="MACOSX" -#APP3STDLIBS+= $(BTSTRPLIB) -.ENDIF -APP3STDLIBS+= \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - -# encoding converter for *.gsi -APP4TARGET= X40gsiconv -APP4OBJS= $(OBJ)$/utf8conv.obj $(OBJ)$/gsiconv.obj -APP4STDLIBS+= \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) - -# tag checker for *.gsi -APP5TARGET= X40gsicheck -APP5OBJS= $(OBJ)$/gsicheck.obj $(OBJ)$/tagtest.obj -APP5STDLIBS+= \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) - -# extractor and merger for *.cfg -APP6TARGET= X40cfgex -APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj - -.IF "$(OS)"!="MACOSX" -#APP6STDLIBS+= $(BTSTRPLIB) -.ENDIF - -APP6STDLIBS+= \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) - -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF - -# extractor and merger for *.xrm -APP7TARGET= X40xrmex -APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj -APP7RPATH= NONE +OBJFILES= $(OBJ)$/gLang.obj \ + $(OBJ)$/gL10nMem.obj \ + $(OBJ)$/gL10nMemDB.obj \ + $(OBJ)$/gHandler.obj \ + $(OBJ)$/gConProp.obj \ + $(OBJ)$/gCon.obj \ + $(OBJ)$/gConDB.obj \ + $(OBJ)$/gConPoWrap.obj \ + $(OBJ)$/gConSrcWrap.obj \ + $(OBJ)$/gConXrmWrap.obj \ + $(OBJ)$/gConXhpWrap.obj \ + $(OBJ)$/gConXcsWrap.obj \ + $(OBJ)$/gConXcuWrap.obj \ + $(OBJ)$/gConUlfWrap.obj \ + $(OBJ)$/gConTreeWrap.obj -.IF "$(OS)"!="MACOSX" -.ENDIF - -APP7STDLIBS+= \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) - -.IF "$(OS)"=="MACOSX" -# static libs at end for OS X -.ENDIF # localizer for new l10n framework -APP8TARGET= genLang -APP8OBJS= $(OBJ)$/gLang.obj $(OBJ)$/gL10nMem.obj \ - $(OBJ)$/gL10nMemDB.obj $(OBJ)$/gHandler.obj \ - $(OBJ)$/gConProp.obj $(OBJ)$/gCon.obj \ - $(OBJ)$/gConDB.obj \ - $(OBJ)$/gConPoWrap.obj $(OBJ)$/gConSrcWrap.obj \ - $(OBJ)$/gConXrmWrap.obj $(OBJ)$/gConXhpWrap.obj \ - $(OBJ)$/gConXcsWrap.obj $(OBJ)$/gConXcuWrap.obj \ - $(OBJ)$/gConUlfWrap.obj $(OBJ)$/gConTreeWrap.obj -APP8RPATH= NONE -APP8STDLIBS= -APP8LIBS= -APP8LINKTYPE=STATIC -APP8LIBSALCPPRT= - - - +APP1TARGET= genLang +APP1OBJS= $(OBJFILES) +APP1RPATH= NONE +APP1LINKTYPE= STATIC + +APP1LIBS= +APP1STDLIBS= +APP1LIBSALCPPRT= -# localizer for l10n framework -APP9TARGET= X40localize_sl -EXCEPTIONSFILES= \ - $(OBJ)$/localize.obj -APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/utf8conv.obj $(OBJ)$/srciter.obj $(OBJ)$/export2.obj $(OBJ)$/file.obj $(OBJ)$/directory.obj $(OBJ)$/treeconfig.obj $(OBJ)$/inireader.obj - -APP9STDLIBS+= \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(ICUINLIB) \ - $(ICUUCLIB) \ - $(STLPORTLIB) \ - $(SALLIB) - -DEPOBJFILES=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) $(APP7OBJS) $(APP8OBJS) $(APP9OBJS) # --- Targets ------------------------------------------------------ - .INCLUDE : target.mk $(MISC)$/%_yy.c : %lex.l flex -l -w -8 -o$@ $< - - # --- Files -------------------------------------------------------- - - -# Helper to suppress warnings in lex generated c code, see #i57362# - $(OBJ)$/gConPoWrap.obj: $(MISC)$/gConPo_yy.c $(OBJ)$/gConSrcWrap.obj: $(MISC)$/gConSrc_yy.c $(OBJ)$/gConXcuWrap.obj: $(MISC)$/gConXcu_yy.c @@ -223,7 +87,3 @@ $(OBJ)$/gConXrmWrap.obj: $(MISC)$/gConX $(OBJ)$/gConXhpWrap.obj: $(MISC)$/gConXhp_yy.c $(OBJ)$/gConUlfWrap.obj: $(MISC)$/gConUlf_yy.c $(OBJ)$/gConTreeWrap.obj: $(MISC)$/gConTree_yy.c - -$(OBJ)$/src_yy_wrapper.obj: $(MISC)$/src_yy.c -$(OBJ)$/cfg_yy_wrapper.obj: $(MISC)$/cfg_yy.c -$(OBJ)$/xrm_yy_wrapper.obj: $(MISC)$/xrm_yy.c