Author: orw
Date: Wed Dec 12 14:17:10 2012
New Revision: 1420691
URL: http://svn.apache.org/viewvc?rev=1420691&view=rev
Log:
#121466# - replace BUILD_SPECIAL by ENABLE_OOOIMPROVEMENT for build stuff
regarding 'OOo improvement via usage tracking' feature
- start documentation of specified variables in openoffice.lst file
Added:
openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README
Modified:
openoffice/trunk/main/desktop/registry/data/org/openoffice/Office/makefile.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_improvement.scp
openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
openoffice/trunk/main/scp2/source/ooo/module_improvement.scp
Modified:
openoffice/trunk/main/desktop/registry/data/org/openoffice/Office/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/registry/data/org/openoffice/Office/makefile.mk?rev=1420691&r1=1420690&r2=1420691&view=diff
==============================================================================
---
openoffice/trunk/main/desktop/registry/data/org/openoffice/Office/makefile.mk
(original)
+++
openoffice/trunk/main/desktop/registry/data/org/openoffice/Office/makefile.mk
Wed Dec 12 14:17:10 2012
@@ -38,7 +38,7 @@ PROCESSORDIR=$(SOLARBINDIR)
# --- Files -------------------------------------------------------
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_OOOIMPROVEMENT)"!=""
XCUFILES= \
Jobs.xcu
@@ -53,12 +53,12 @@ SPOOLDIR=$(MISC)$/registry$/spool
MYXCUFILES= \
$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu
-.ELSE # "$(BUILD_SPECIAL)"!=""
+.ELSE # "$(ENABLE_OOOIMPROVEMENT)"!=""
dummy:
@echo "Nothing to build"
-.ENDIF # "$(BUILD_SPECIAL)"!=""
+.ENDIF # "$(ENABLE_OOOIMPROVEMENT)"!=""
# --- Targets ------------------------------------------------------
Added: openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README?rev=1420691&view=auto
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README (added)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst.README Wed Dec
12 14:17:10 2012
@@ -0,0 +1,10 @@
+Some documentation for the variables specified in file openoffice.lst.
+
+VARIABLE NAME USAGE
+-------------------------------------------------------------------------------
+SERVICETAG_PRODUCTNAME only for 'OOo improvement via usage tracking'
+SERVICETAG_PRODUCTVERSION only for 'OOo improvement via usage tracking'
+SERVICETAG_PARENTNAME only for 'OOo improvement via usage tracking'
+SERVICETAG_SOURCE only for 'OOo improvement via usage tracking'
+SERVICETAG_URN only for 'OOo improvement via usage tracking'
+
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1420691&r1=1420690&r2=1420691&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Dec 12
14:17:10 2012
@@ -190,7 +190,7 @@ my_components += component/vcl/vcl.unx
my_components += updchk.uno
.END
-.IF "$(BUILD_SPECIAL)" != ""
+.IF "$(ENABLE_OOOIMPROVEMENT)" != ""
my_components += oooimprovement
.END
Modified: openoffice/trunk/main/scp2/source/ooo/file_improvement.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_improvement.scp?rev=1420691&r1=1420690&r2=1420691&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_improvement.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_improvement.scp Wed Dec 12
14:17:10 2012
@@ -23,7 +23,7 @@
#include "macros.inc"
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
File gid_File_Share_Registry_Oooimprovement_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
@@ -32,7 +32,7 @@ File gid_File_Share_Registry_Oooimprovem
End
#endif
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
#ifdef OS2
STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimp)
#else
Modified: openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1420691&r1=1420690&r2=1420691&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_ooo.scp Wed Dec 12 14:17:10 2012
@@ -1780,7 +1780,7 @@ File gid_File_Share_Registry_Lingucompon
Name = "lingucomponent.xcd";
End
-// #ifdef BUILD_SPECIAL
+// #ifdef ENABLE_OOOIMPROVEMENT
// File gid_File_Extension_Oxt_Oooimprovement
// Name = "OOoImprovement.oxt";
// Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement;
Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1420691&r1=1420690&r2=1420691&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Wed Dec 12
14:17:10 2012
@@ -813,7 +813,7 @@ Module gid_Module_Root_Userland
End
#endif
-// #ifdef BUILD_SPECIAL
+// #ifdef ENABLE_OOOIMPROVEMENT
// Module gid_Module_Root_Extension_Oooimprovement
// Name = "gid_Module_Root_Extension_Oooimprovement";
// Description = "gid_Module_Root_Extension_Oooimprovement";
Modified: openoffice/trunk/main/scp2/source/ooo/module_improvement.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_improvement.scp?rev=1420691&r1=1420690&r2=1420691&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_improvement.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_improvement.scp Wed Dec 12
14:17:10 2012
@@ -25,7 +25,7 @@
// OOo improvement module
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
Module gid_Module_Oooimprovement
PackageInfo = "packinfo_office.txt";
Name = "gid_Module_Oooimprovement";
