debuglevels: outsourced creation of the smoketest doc into an own module, so it…

debuglevels: outsourced creation of the smoketest doc into an own module, so it can be used outside smoketesoo_native, too

smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk → smoketestdoc/com/sun/star/comp/smoketest/makefile.mk

@@ -25,9 +25,9 @@
 #
 #*************************************************************************
 
-PRJ     = ..$/..$/..$/..$/..
-PRJNAME = smoke_test
-PACKAGE = com$/sun$/star$/comp$/smoketest
+PRJ     = ../../../../..
+PRJNAME = smoketestdoc
+PACKAGE = com/sun/star/comp/smoketest
 TARGET  = com_sun_star_comp_smoketest
 
 no_common_build_zip:=TRUE
@@ -40,7 +40,6 @@ no_common_build_zip:=TRUE
 
 JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
 
-
 JARTARGET          = TestExtension.jar
 JARCOMPRESS        = TRUE
 CUSTOMMANIFESTFILE = MANIFEST.MF
@@ -48,41 +47,41 @@ CUSTOMMANIFESTFILE = MANIFEST.MF
 ZIP1TARGET=TestExtension
 ZIP1LIST=*
 ZIPFLAGS=-r
-ZIP1DIR=$(MISC)$/$(TARGET)
+ZIP1DIR=$(MISC)/$(TARGET)
 ZIP1EXT=.oxt
 
 # --- Files --------------------------------------------------------
 
-#COPY_OXT_MANIFEST:= $(MISC)$/$(TARGET)$/META-INF$/manifest.xml
+#COPY_OXT_MANIFEST:= $(MISC)/$(TARGET)/META-INF/manifest.xml
 JAVAFILES = TestExtension.java
 
 # --- Targets ------------------------------------------------------
 
-ZIP1DEPS=$(MISC)$/$(TARGET)$/$(JARTARGET)\
-         $(MISC)$/$(TARGET)$/TestExtension.rdb\
-         $(MISC)$/$(TARGET)$/META-INF$/manifest.xml
+ZIP1DEPS=$(MISC)/$(TARGET)/$(JARTARGET)\
+         $(MISC)/$(TARGET)/TestExtension.rdb\
+         $(MISC)/$(TARGET)/META-INF/manifest.xml
 
 .INCLUDE :  target.mk
 
-$(MISC)$/$(TARGET)$/META-INF:
+$(MISC)/$(TARGET)/META-INF:
     @-$(MKDIRHIER) $(@)
 
-$(MISC)$/TestExtension.urd: TestExtension.idl
-    $(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $<
+$(MISC)/TestExtension.urd: TestExtension.idl
+    $(COMMAND_ECHO)$(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $<
 
-$(MISC)$/$(TARGET)$/META-INF$/manifest.xml $(MISC)$/$(TARGET)$/TestExtension.rdb : $(MISC)$/$(TARGET)$/META-INF
+$(MISC)/$(TARGET)/META-INF/manifest.xml $(MISC)/$(TARGET)/TestExtension.rdb : $(MISC)/$(TARGET)/META-INF
 
-$(MISC)$/$(TARGET)$/META-INF$/manifest.xml: manifest.xml
-    $(COPY) $< $@
+$(MISC)/$(TARGET)/META-INF/manifest.xml: manifest.xml
+    $(COMMAND_ECHO)$(COPY) $< $@
 
-$(MISC)$/$(TARGET)$/TestExtension.rdb: $(MISC)$/TestExtension.urd
-    $(REGMERGE) $@ /UCR $<
+$(MISC)/$(TARGET)/TestExtension.rdb: $(MISC)/TestExtension.urd
+    $(COMMAND_ECHO)$(REGMERGE) $@ /UCR $<
 
-$(JAVACLASSFILES) .UPDATEALL: $(MISC)$/$(TARGET)$/TestExtension.rdb
-    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
+$(JAVACLASSFILES) .UPDATEALL: $(MISC)/$(TARGET)/TestExtension.rdb
+    $(COMMAND_ECHO)$(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
 
-$(MISC)$/$(TARGET)$/$(JARTARGET) : $(JARTARGETN)
-    $(COPY) $< $@
+$(MISC)/$(TARGET)/$(JARTARGET) : $(JARTARGETN)
+    $(COMMAND_ECHO)$(COPY) $< $@
 
 .ELSE
 @all:

smoketestdoc/data/makefile.mk

+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+PRJ = ..
+PRJNAME = smoketestdoc
+TARGET = data
+
+.INCLUDE: settings.mk
+
+$(BIN)/smoketestdoc.sxw: $(MISC)/zip/smoketestdoc.sxw
+    $(COPY) $< $@
+
+$(MISC)/zip/smoketestdoc.sxw: \
+        Events.xml \
+        Global.xml \
+        OptionsDlg.xml \
+        Test_10er.xml \
+        Test_DB.xml \
+        Test_Ext.xml \
+        content.xml \
+        dialog-lb.xml \
+        dialog-lc.xml \
+        manifest.xml \
+        meta.xml \
+        script-lb.xml \
+        script-lc.xml \
+        settings.xml \
+        styles.xml
+    $(COMMAND_ECHO)$(RM) -r $(MISC)/zip
+    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip
+    $(COMMAND_ECHO)$(COPY) content.xml meta.xml settings.xml styles.xml $(MISC)/zip/
+    $(COMMAND_ECHO)printf application/vnd.sun.xml.writer > $(MISC)/zip/mimetype
+    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/META-INF
+    $(COMMAND_ECHO)$(COPY) manifest.xml $(MISC)/zip/META-INF/
+    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic
+    $(COMMAND_ECHO)$(COPY) script-lc.xml $(MISC)/zip/Basic/
+    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic/Standard
+    $(COMMAND_ECHO)$(COPY) script-lb.xml Events.xml Global.xml Test_10er.xml Test_DB.xml \
+        Test_Ext.xml $(MISC)/zip/Basic/Standard/
+    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs
+    $(COMMAND_ECHO)$(COPY) dialog-lc.xml $(MISC)/zip/Dialogs/
+    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs/Standard
+    $(COMMAND_ECHO)$(COPY) dialog-lb.xml OptionsDlg.xml $(MISC)/zip/Dialogs/Standard/
+    $(COMMAND_ECHO)cd $(MISC)/zip && zip -rD $(@:f) .
+
+.INCLUDE: target.mk

smoketestdoc/prj/build.lst

+smdoc   smoketestdoc :: NULL
+smdoc   smoketestdoc                                    usr1    -   all smdoc_mkout NULL
+smdoc   smoketestdoc\data                               nmake   -   all smdoc_data NULL
+smtoon  smoketestoo_native\com\sun\star\comp\smoketest  nmake   -   all smdoc_ext NULL

smoketestdoc/prj/d.lst

+mkdir: %_DEST%\bin%_EXT%
+
+..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin%_EXT%\smoketestdoc.sxw
+..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin%_EXT%\TestExtension.oxt

smoketestoo_native/makefile.mk

@@ -56,7 +56,7 @@ ALLTAR : cpptest
 
 cpptest : $(SHL1TARGETN)
 
-TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw
+TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(PROEXT)/smoketestdoc.sxw
 CPPTEST_LIBRARY = $(SHL1TARGETN)
 
 .IF "$(OS)" != "WNT"

smoketestoo_native/prj/build.lst

-smtoon      smoketestoo_native     ::       instsetoo_native test NULL
+smtoon      smoketestoo_native     ::       instsetoo_native test smoketestdoc NULL
 smtoon      smoketestoo_native    usr1	-       all     smoketestoonative_mkout NULL
-smtoon      smoketestoo_native\com\sun\star\comp\smoketest    nmake    -       all smoketestoonative_csscs NULL
-smtoon      smoketestoo_native\data nmake - all smoketestoonative_data NULL
-smtoon      smoketestoo_native    nmake	-       all,test10     smoketestoonative_mk smoketestoonative_csscs smoketestoonative_data NULL
+smtoon      smoketestoo_native    nmake	-       all,test10     smoketestoonative_mk NULL