Commits

Anonymous committed d5eb667 Merge

CWS-TOOLING: integrate CWS kso45

  • Participants
  • Parent commits 36b2eb0, d960bd0

Comments (0)

Files changed (8)

File desktop/test/deployment/boxt/makefile.mk

 
 .INCLUDE: settings.mk
 .INCLUDE: rtlbootstrap.mk
+.INCLUDE: versionlist.mk
 
-#TODO: The underlying OOo base version needed here is currently only available
-# as instsetoo_native/util/openoffice.lst OOOBASEVERSION, so hard-coding it here
-# for now (see issue 110653):
-my_version = 3.3
+my_version = $(OOOBASEVERSIONMAJOR).$(OOOBASEVERSIONMINOR)
 
 DLLPRE =
 

File desktop/util/ooverinfo2.rc

 /*************************************************************************
  *
  * 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
  *
  *************************************************************************/
 
-#define VERSION			3
-#define SUBVERSION		2
-//#define VERVARIANT		0
+#define VERSION         3
+#define SUBVERSION      3
+//#define VERVARIANT    0
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT		0
-//#define VER_BETA		6
-#define VER_FINAL		0
+//#define VER_CONCEPT   0
+//#define VER_BETA      6
+#define VER_FINAL       0
 
-#define VER_DAY			1
-#define VER_MONTH		9
-#define VER_YEAR		2009
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
 
 // -----------------------------------------------------------------------
 
 // -----------------------------------------------------------------------
-// 				language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 

File instsetoo_native/util/openoffice.lst

             PCPFILENAME openoffice.pcp
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			BASEPRODUCTVERSION 3.3
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
+            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
 			PACKAGEMAP package_names_ext.txt
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
         }
 			NATIVEPROGRESS
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			NATIVEPROGRESS
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
 			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0

File solenv/inc/version.hrc

 /*************************************************************************
  *
  * 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
  *
  *************************************************************************/
 
-#define VERSION			3
-#define SUBVERSION		2
-//#define VERVARIANT	0 // never define this one, will be provided by build environment (BUILD_ID)
+#define VERSION         3
+#define SUBVERSION      3
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT		0
-//#define VER_BETA		6
-#define VER_FINAL		0
+//#define VER_CONCEPT   0
+//#define VER_BETA      6
+#define VER_FINAL       0
 
-#define VER_DAY			1
-#define VER_MONTH		1
-#define VER_YEAR		2010
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
 
 #ifndef VER_FIRSTYEAR
-#define VER_FIRSTYEAR	VER_YEAR
+#define VER_FIRSTYEAR   VER_YEAR
 #endif
 
 #include "verinfo.hrc"
 #endif
 
 // -----------------------------------------------------------------------
-// 				language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
 {
 #ifdef LG_D
-	"040704B0", 	// Germany -> Unicode
-	"040704E4", 	// Germany -> Windows, Multilingual
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
 #else
-	"040904B0", 	// Germany -> Unicode
-	"040904E4", 	// USA -> Windows, Multilingual
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
 #endif
-	"04090000", 	// USA -> 7-Bit-ASCII
-	0				// end of table
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
 }
 
 
 // version binary entry
 VS_VERSION_INFO rcdata
 {
-	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-	VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
 };
 

File solenv/inc/version.lst

+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+OOOBASEVERSIONMAJOR=3
+OOOBASEVERSIONMINOR=3
+OOOBASEVERSIONMICRO=0

File solenv/inc/version_so.hrc

 /*************************************************************************
  *
  * 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
  *
  *************************************************************************/
 
-#define VERSION			9
-#define SUBVERSION		2
-//#define VERVARIANT	0 // never define this one, will be provided by build environment (BUILD_ID)
+#define VERSION         9
+#define SUBVERSION      3
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT		0
-//#define VER_BETA		6
-#define VER_FINAL		0
+//#define VER_CONCEPT   0
+//#define VER_BETA      6
+#define VER_FINAL       0
 
-#define VER_DAY			1
-#define VER_MONTH		1
-#define VER_YEAR		2010
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
 
 #ifndef VER_FIRSTYEAR
-#define VER_FIRSTYEAR	VER_YEAR
+#define VER_FIRSTYEAR   VER_YEAR
 #endif
 
 #include "verinfo.hrc"
 #endif
 
 // -----------------------------------------------------------------------
-// 				language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
 {
 #ifdef LG_D
-	"040704B0", 	// Germany -> Unicode
-	"040704E4", 	// Germany -> Windows, Multilingual
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
 #else
-	"040904B0", 	// Germany -> Unicode
-	"040904E4", 	// USA -> Windows, Multilingual
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
 #endif
-	"04090000", 	// USA -> 7-Bit-ASCII
-	0				// end of table
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
 }
 
 // version binary entry
 VS_VERSION_INFO rcdata
 {
-	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
-	VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
 };
 

File solenv/inc/versionlist.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.
+#
+#*************************************************************************
+
+.INCLUDE: version.lst
+
+.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO

File solenv/prj/d.lst

+mkdir: %_DEST%\bin%_EXT
+..\inc\version.lst %_DEST%\bin%_EXT%\version.lst