#121466# - replace BUILD_SPECIAL by ENABLE_OOOIMPROVEMENT for build stuff…

#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

desktop/registry/data/org/openoffice/Office/makefile.mk

@@ -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 ------------------------------------------------------
 

instsetoo_native/util/openoffice.lst.README

+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'
+

postprocess/packcomponents/makefile.mk

@@ -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
 

scp2/source/ooo/file_improvement.scp

@@ -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_Oooimprovement_Xcd
 End
 #endif
 
-#if defined(BUILD_SPECIAL)
+#if defined(ENABLE_OOOIMPROVEMENT)
 #ifdef OS2
 STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimp)
 #else

scp2/source/ooo/file_ooo.scp

@@ -1780,7 +1780,7 @@ File gid_File_Share_Registry_Lingucomponent_Xcd
     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;

scp2/source/ooo/module_hidden_ooo.scp

@@ -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";

scp2/source/ooo/module_improvement.scp

@@ -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";