Author: jsc
Date: Tue Nov 27 08:29:18 2012
New Revision: 1414017
URL: http://svn.apache.org/viewvc?rev=1414017&view=rev
Log:
#121389# remove old testool resources and obsolete testautomation module
Removed:
openoffice/trunk/main/basic/source/app/
openoffice/trunk/main/testautomation/
Modified:
openoffice/trunk/main/automation/prj/build.lst
openoffice/trunk/main/automation/util/makefile.mk
openoffice/trunk/main/basic/prj/build.lst
openoffice/trunk/main/basic/prj/d.lst
openoffice/trunk/main/basic/util/makefile.mk
openoffice/trunk/main/instsetoo_native/prj/build.lst
openoffice/trunk/main/postprocess/checkdeliver/checkdeliver.pl
openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp
Modified: openoffice/trunk/main/automation/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/automation/prj/build.lst?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/automation/prj/build.lst (original)
+++ openoffice/trunk/main/automation/prj/build.lst Tue Nov 27 08:29:18 2012
@@ -5,7 +5,8 @@ au automation\source\simplecm
nmake -
au automation\source\communi nmake -
all au_comm au_inc NULL
au automation\source\app nmake -
all au_app au_inc NULL
au automation\source\server nmake -
all au_server au_inc NULL
-au automation\source\testtool nmake -
all au_tt au_inc NULL
-au automation\source\miniapp nmake -
all au_mini au_inc NULL
-au automation\packimages nmake -
all au_pack NULL
-au automation\util nmake
- all au_util au_scom au_comm au_app au_mini au_server au_tt NULL
+#au automation\source\testtool nmake -
all au_tt au_inc NULL
+#au automation\source\miniapp nmake -
all au_mini au_inc NULL
+#au automation\packimages nmake -
all au_pack NULL
+au automation\util nmake
- all au_util au_scom au_comm au_app au_server NULL
+#au automation\util nmake
- all au_util au_scom au_comm au_app au_mini au_server au_tt NULL
Modified: openoffice/trunk/main/automation/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/automation/util/makefile.mk?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/automation/util/makefile.mk (original)
+++ openoffice/trunk/main/automation/util/makefile.mk Tue Nov 27 08:29:18 2012
@@ -130,18 +130,18 @@ DEF3DES =Communication
# --- TESTTOOL IDE ------------------------------------------------------
-APP1TARGET=testtool
+#APP1TARGET=testtool
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
-.ELSE
-APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
-.ENDIF
-APP1STDLIBS= \
+#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
+#APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
+#.ELSE
+#APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
+#.ENDIF
+#APP1STDLIBS= \
$(APP3RDLIB) \
$(SAMPLE3RDLIB)
-APP1STDLIBS+= \
+#APP1STDLIBS+= \
$(CPPUHELPERLIB) \
$(TOOLSLIB) \
$(UNOTOOLSLIB) \
@@ -156,54 +156,54 @@ APP1STDLIBS+= \
$(SIMPLECMLIB) \
$(COMMUNILIB)
-.IF "$(GUI)"=="UNX"
-APP1STDLIBS+= \
+#.IF "$(GUI)"=="UNX"
+#APP1STDLIBS+= \
$(VOSLIB) $(SALLIB) $(BASICLIB)
-APP1STDLIBS+=$(CPPULIB)
-.ENDIF
-.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-APP1STDLIBS+=$(CPPULIB)
-.ENDIF
+#APP1STDLIBS+=$(CPPULIB)
+#.ENDIF
+#.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
+#APP1STDLIBS+=$(CPPULIB)
+#.ENDIF
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS += \
+#.IF "$(GUI)"=="WNT"
+#APP1STDLIBS += \
$(SHELL32LIB) \
$(ADVAPI32LIB)
-.ENDIF # "$(GUI)"=="WNT"
+#.ENDIF # "$(GUI)"=="WNT"
-.IF "$(OS)" == "SOLARIS"
-APP1STDLIBS+= -lXm
-.ENDIF
+#.IF "$(OS)" == "SOLARIS"
+#APP1STDLIBS+= -lXm
+#.ENDIF
-.IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "LINUX"
-APP1STDLIBS+= -lXext -lX11 -lSM -lICE
-.ENDIF
-.IF "$(OS)"=="MACOSX"
-APP1STDLIBS+= -lapp -lsample
-.ENDIF
-.ENDIF
+#.IF "$(GUI)" == "UNX"
+#.IF "$(OS)" == "LINUX"
+#APP1STDLIBS+= -lXext -lX11 -lSM -lICE
+#.ENDIF
+#.IF "$(OS)"=="MACOSX"
+#APP1STDLIBS+= -lapp -lsample
+#.ENDIF
+#.ENDIF
-APP1LIBS=\
+#APP1LIBS=\
$(LB)$/testtool.lib
-APP1OBJS= $(OBJ)$/testbasi.obj \
+#APP1OBJS= $(OBJ)$/testbasi.obj \
$(OBJ)$/cmdbasestream.obj \
$(OBJ)$/svcommstream.obj
# --- TESTTOOL MINIAPP ------------------------------------------------------
# ressources are linked here
-RESLIB1NAME=tma
-RESLIB1SRSFILES= \
+#RESLIB1NAME=tma
+#RESLIB1SRSFILES= \
$(SRS)$/miniapp.srs
-APP3TARGET=miniapp
-APP3STDLIBS= \
+#APP3TARGET=miniapp
+#APP3STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(UCBHELPERLIB) \
@@ -214,31 +214,31 @@ APP3STDLIBS= \
$(SVTOOLLIB) \
$(VCLLIB)
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="MACOSX"
-APP3STDLIBS+= \
+#.IF "$(GUI)"=="UNX"
+#.IF "$(OS)"=="MACOSX"
+#APP3STDLIBS+= \
$(VOSLIB) $(SALLIB) $(LIBSTLPORT)
-.ELSE
-APP3STDLIBS+= \
+#.ELSE
+#APP3STDLIBS+= \
$(VOSLIB) $(SALLIB)
-.ENDIF
-.ENDIF
+#.ENDIF
+#.ENDIF
# $(AUTOMATIONLIB) is build in SHL1TARGET
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-APP3DEPN=$(SHL1TARGETN)
-.ELSE
-APP3DEPN=$(SHL1IMPLIBN)
-.ENDIF
+#.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
+#APP3DEPN=$(SHL1TARGETN)
+#.ELSE
+#APP3DEPN=$(SHL1IMPLIBN)
+#.ENDIF
-APP3LIBS= \
+#APP3LIBS= \
$(LB)$/miniapp.lib
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
+#.IF "$(GUI)" != "UNX"
+#.IF "$(COM)" != "GCC"
# win16 braucht ein appobj
-APP3OBJS= $(OBJ)$/testapp.obj
-.ENDIF
-.ENDIF
+#APP3OBJS= $(OBJ)$/testapp.obj
+#.ENDIF
+#.ENDIF
# --- Targets -----------------------------------------------------------
Modified: openoffice/trunk/main/basic/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/prj/build.lst?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/basic/prj/build.lst (original)
+++ openoffice/trunk/main/basic/prj/build.lst Tue Nov 27 08:29:18 2012
@@ -1,7 +1,6 @@
sb basic : L10N:l10n offuh oovbaapi svtools xmlscript framework
salhelper LIBXSLT:libxslt NULL
sb basic
usr1 - all sb_mkout NULL
sb basic\inc
nmake - all sb_inc NULL
-sb basic\source\app nmake
- all sb_app sb_class sb_inc NULL
sb basic\source\basmgr nmake
- all sb_mgr sb_inc NULL
sb basic\source\classes nmake -
all sb_class sb_inc NULL
sb basic\source\comp nmake
- all sb_comp sb_inc NULL
@@ -9,5 +8,5 @@ sb basic\source\runtime
nmake - all
sb basic\source\sample nmake
- all sb_samp sb_inc NULL
sb basic\source\sbx nmake
- all sb_sbx sb_inc NULL
sb basic\source\uno nmake - all sb_uno
sb_inc NULL
-sb basic\util
nmake - all sb_util sb_app sb_class sb_comp sb_mgr sb_rt sb_samp
sb_sbx sb_uno NULL
+sb basic\util
nmake - all sb_util sb_class sb_comp sb_mgr sb_rt sb_samp sb_sbx
sb_uno NULL
Modified: openoffice/trunk/main/basic/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/prj/d.lst?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/basic/prj/d.lst (original)
+++ openoffice/trunk/main/basic/prj/d.lst Tue Nov 27 08:29:18 2012
@@ -13,10 +13,7 @@ mkdir: %COMMON_DEST%\res%_EXT%
..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll
..\%__SRC%\bin\sb?????.sym %_DEST%\bin%_EXT%\sb?????.sym
..\%__SRC%\misc\sb?????.map %_DEST%\bin%_EXT%\sb?????.map
-..\%__SRC%\bin\stt*.res %_DEST%\bin%_EXT%\stt*.res
..\%__SRC%\bin\sb*.res %_DEST%\bin%_EXT%\sb*.res
-..\%__SRC%\lib\app.lib %_DEST%\lib%_EXT%\app.lib
-..\%__SRC%\lib\libapp.a %_DEST%\lib%_EXT%\libapp.a
..\%__SRC%\lib\sample.lib %_DEST%\lib%_EXT%\sample.lib
..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
Modified: openoffice/trunk/main/basic/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/util/makefile.mk?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/basic/util/makefile.mk (original)
+++ openoffice/trunk/main/basic/util/makefile.mk Tue Nov 27 08:29:18 2012
@@ -98,14 +98,6 @@ SRS1FILES= \
$(SRS)$/classes.srs \
$(SRS)$/sbx.srs
-# --- TESTTOOL IDE ------------------------------------------------------
-# The resources are linked here
-
-RESLIB1NAME=stt
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= \
- $(SRS)$/app.srs
-
RESLIB2NAME=sb
RESLIB2IMAGES=$(PRJ)$/res
RESLIB2SRSFILES= \
Modified: openoffice/trunk/main/instsetoo_native/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/prj/build.lst?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/prj/build.lst (original)
+++ openoffice/trunk/main/instsetoo_native/prj/build.lst Tue Nov 27 08:29:18
2012
@@ -1,4 +1,4 @@
-oon instsetoo_native :: L10N:l10n postprocess packimages
testautomation RAT:ratscan NULL
+oon instsetoo_native :: L10N:l10n postprocess packimages
RAT:ratscan NULL
oon instsetoo_native usr1
- all oon_mkout NULL
oon instsetoo_native\inc_openoffice\unix nmake - u
oon_unix NULL
oon instsetoo_native\inc_openoffice\windows\msi_languages nmake -
all oon_msilang NULL
Modified: openoffice/trunk/main/postprocess/checkdeliver/checkdeliver.pl
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/checkdeliver/checkdeliver.pl?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/checkdeliver/checkdeliver.pl (original)
+++ openoffice/trunk/main/postprocess/checkdeliver/checkdeliver.pl Tue Nov 27
08:29:18 2012
@@ -48,7 +48,6 @@ my @exceptionmodlist = (
"postprocess",
"instset.*native",
"smoketest.*native",
- "testautomation",
"testgraphical"
); # modules not yet delivered
Modified: openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp?rev=1414017&r1=1414016&r2=1414017&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_resource_ooo.scp Tue Nov 27
08:29:18 2012
@@ -80,7 +80,7 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
#endif
-STD_RES_FILE( gid_File_Res_Stt, stt )
+#STD_RES_FILE( gid_File_Res_Stt, stt )
STD_RES_FILE( gid_File_Res_Sb, sb )
STD_RES_FILE( gid_File_Res_Svl, svl )
