You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2012/06/19 12:00:16 UTC
svn commit: r1351633 - in /incubator/ooo/trunk/main:
instsetoo_native/util/openoffice.lst solenv/inc/version.lst
sysui/desktop/productversion.mk
Author: jsc
Date: Tue Jun 19 10:00:15 2012
New Revision: 1351633
URL: http://svn.apache.org/viewvc?rev=1351633&view=rev
Log:
119977: update version number to 3.5
Modified:
incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
incubator/ooo/trunk/main/solenv/inc/version.lst
incubator/ooo/trunk/main/sysui/desktop/productversion.mk
Modified: incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst?rev=1351633&r1=1351632&r2=1351633&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Tue Jun 19 10:00:15 2012
@@ -4,15 +4,15 @@ Globals
{
variables
{
- OOOBASEVERSION 3.4
- OOOPACKAGEVERSION 3.4.0
- UREPACKAGEVERSION 3.4.0
+ OOOBASEVERSION 3.5
+ OOOPACKAGEVERSION 3.5.0
+ UREPACKAGEVERSION 3.5.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice.org
UNIXBASISROOTNAME openoffice.org
- SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
- SERVICETAG_PRODUCTVERSION 3.4
- SERVICETAG_PARENTNAME OpenOffice.org 3.4
+ SERVICETAG_PRODUCTNAME OpenOffice.org 3.5
+ SERVICETAG_PRODUCTVERSION 3.5
+ SERVICETAG_PARENTNAME OpenOffice.org 3.5
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
HIDELICENSEDIALOG 1
@@ -54,7 +54,7 @@ OpenOffice
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -62,8 +62,8 @@ OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
PCPFILENAME openoffice.pcp
UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -74,7 +74,7 @@ OpenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -118,7 +118,7 @@ OpenOffice_wJRE
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -126,8 +126,8 @@ OpenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
UPDATEURL http://update38.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,version.lst
@@ -137,7 +137,7 @@ OpenOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
WITHJREPRODUCT 1
@@ -182,7 +182,7 @@ OpenOffice_Dev
variables
{
PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -192,8 +192,8 @@ OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
- BASEPRODUCTVERSION 3.4
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX ooobasis-dev
UREPACKAGEPREFIX ooodev
@@ -207,7 +207,7 @@ OpenOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {milestone}
LICENSENAME ALv2
GLOBALFILEGID gid_File_Lib_Vcl
@@ -255,8 +255,8 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 3.4
- PACKAGEVERSION 3.4
+ PRODUCTVERSION 3.5
+ PACKAGEVERSION 3.5
PACKAGEREVISION 1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -296,14 +296,14 @@ OpenOffice_SDK
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -342,7 +342,7 @@ OpenOffice_Dev_SDK
variables
{
PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.4
+ PRODUCTVERSION 3.5
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -351,7 +351,7 @@ OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.5.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX ooobasis-dev
UREPACKAGEPREFIX ooodev
@@ -361,7 +361,7 @@ OpenOffice_Dev_SDK
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
- DATABASENAME openofficeorg34devsdk
+ DATABASENAME openofficeorg35devsdk
NO_README_IN_ROOTDIR 1
LICENSENAME ALv2
IGNOREDIRECTORYLAYER 1
Modified: incubator/ooo/trunk/main/solenv/inc/version.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/version.lst?rev=1351633&r1=1351632&r2=1351633&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/version.lst (original)
+++ incubator/ooo/trunk/main/solenv/inc/version.lst Tue Jun 19 10:00:15 2012
@@ -20,7 +20,7 @@
#**************************************************************
OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=4
+OOOBASEVERSIONMINOR=5
OOOBASEVERSIONMICRO=0
OOOBASEVERSIONDAY=1
Modified: incubator/ooo/trunk/main/sysui/desktop/productversion.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sysui/desktop/productversion.mk?rev=1351633&r1=1351632&r2=1351633&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sysui/desktop/productversion.mk (original)
+++ incubator/ooo/trunk/main/sysui/desktop/productversion.mk Tue Jun 19 10:00:15 2012
@@ -46,7 +46,7 @@ PRODUCTLIST = openoffice.org
# default values to minimize maintainance effort
# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
-PRODUCTVERSION = 3.4
+PRODUCTVERSION = 3.5
# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
PRODUCTVERSIONSHORT = 3
Re: svn commit: r1351633 - in /incubator/ooo/trunk/main: instsetoo_native/util/openoffice.lst
solenv/inc/version.lst sysui/desktop/productversion.mk
Posted by "Marcus (OOo)" <ma...@wtnet.de>.
Am 06/20/2012 07:19 AM, schrieb Jürgen Schmidt:
> On 6/19/12 10:07 PM, Marcus (OOo) wrote:
>> Am 06/19/2012 12:00 PM, schrieb jsc@apache.org:
>>> Author: jsc
>>> Date: Tue Jun 19 10:00:15 2012
>>> New Revision: 1351633
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1351633&view=rev
>>> Log:
>>> 119977: update version number to 3.5
>>>
>>> Modified:
>>> incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
>>> incubator/ooo/trunk/main/solenv/inc/version.lst
>>> incubator/ooo/trunk/main/sysui/desktop/productversion.mk
>>>
>>> Modified: incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
>>> URL:
>>> http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst?rev=1351633&r1=1351632&r2=1351633&view=diff
>>>
>>> ==============================================================================
>>>
>>> --- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
>>> (original)
>>> +++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Tue
>>> Jun 19 10:00:15 2012
>>> @@ -4,15 +4,15 @@ Globals
>>> {
>>> variables
>>> {
>>> - SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
>>> - SERVICETAG_PRODUCTVERSION 3.4
>>> - SERVICETAG_PARENTNAME OpenOffice.org 3.4
>>> + SERVICETAG_PRODUCTNAME OpenOffice.org 3.5
>>> + SERVICETAG_PRODUCTVERSION 3.5
>>> + SERVICETAG_PARENTNAME OpenOffice.org 3.5
>>> SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
>>> SERVICETAG_URN
>>> urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
>>
>> BTW:
>>
>> IMHO another nice example to get rid of old and no longer needed code:
>> The Service Tag [1] implementation from what has Sun included.
>>
>> It's very simple:
>> We don't want any registrations --> so we don't need Service Tags anymore.
>
> good catch Marcus, we should check where this variable are used and
> should clean up the code.
>
> It can be a good opportunity work for somebody who want to do the first
> steps with the code. OpenGrok to search where the variables are used +
> understanding what's going on + some editing + building + testing
>
> Volunteers are welcome and questions will be answered here on the list
> or on IRC
For this challenge I've created a BZ issue:
https://issues.apache.org/ooo/show_bug.cgi?id=120047
Service Tag implementation is no longer needed and should be removed
Marcus
>> [1]
>> http://www.oracle.com/technetwork/articles/javase/productregistration-142210.html
>>
>>
>> My 2 ct.
>>
>> Marcus
Re: svn commit: r1351633 - in /incubator/ooo/trunk/main: instsetoo_native/util/openoffice.lst
solenv/inc/version.lst sysui/desktop/productversion.mk
Posted by Jürgen Schmidt <jo...@googlemail.com>.
On 6/19/12 10:07 PM, Marcus (OOo) wrote:
> Am 06/19/2012 12:00 PM, schrieb jsc@apache.org:
>> Author: jsc
>> Date: Tue Jun 19 10:00:15 2012
>> New Revision: 1351633
>>
>> URL: http://svn.apache.org/viewvc?rev=1351633&view=rev
>> Log:
>> 119977: update version number to 3.5
>>
>> Modified:
>> incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
>> incubator/ooo/trunk/main/solenv/inc/version.lst
>> incubator/ooo/trunk/main/sysui/desktop/productversion.mk
>>
>> Modified: incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
>> URL:
>> http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst?rev=1351633&r1=1351632&r2=1351633&view=diff
>>
>> ==============================================================================
>>
>> --- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
>> (original)
>> +++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Tue
>> Jun 19 10:00:15 2012
>> @@ -4,15 +4,15 @@ Globals
>> {
>> variables
>> {
>> - SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
>> - SERVICETAG_PRODUCTVERSION 3.4
>> - SERVICETAG_PARENTNAME OpenOffice.org 3.4
>> + SERVICETAG_PRODUCTNAME OpenOffice.org 3.5
>> + SERVICETAG_PRODUCTVERSION 3.5
>> + SERVICETAG_PARENTNAME OpenOffice.org 3.5
>> SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
>> SERVICETAG_URN
>> urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
>
> BTW:
>
> IMHO another nice example to get rid of old and no longer needed code:
> The Service Tag [1] implementation from what has Sun included.
>
> It's very simple:
> We don't want any registrations --> so we don't need Service Tags anymore.
good catch Marcus, we should check where this variable are used and
should clean up the code.
It can be a good opportunity work for somebody who want to do the first
steps with the code. OpenGrok to search where the variables are used +
understanding what's going on + some editing + building + testing
Volunteers are welcome and questions will be answered here on the list
or on IRC
Juergen
>
> [1]
> http://www.oracle.com/technetwork/articles/javase/productregistration-142210.html
>
>
> My 2 ct.
>
> Marcus
Re: svn commit: r1351633 - in /incubator/ooo/trunk/main: instsetoo_native/util/openoffice.lst
solenv/inc/version.lst sysui/desktop/productversion.mk
Posted by "Marcus (OOo)" <ma...@wtnet.de>.
Am 06/19/2012 12:00 PM, schrieb jsc@apache.org:
> Author: jsc
> Date: Tue Jun 19 10:00:15 2012
> New Revision: 1351633
>
> URL: http://svn.apache.org/viewvc?rev=1351633&view=rev
> Log:
> 119977: update version number to 3.5
>
> Modified:
> incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
> incubator/ooo/trunk/main/solenv/inc/version.lst
> incubator/ooo/trunk/main/sysui/desktop/productversion.mk
>
> Modified: incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
> URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst?rev=1351633&r1=1351632&r2=1351633&view=diff
> ==============================================================================
> --- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst (original)
> +++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Tue Jun 19 10:00:15 2012
> @@ -4,15 +4,15 @@ Globals
> {
> variables
> {
> - SERVICETAG_PRODUCTNAME OpenOffice.org 3.4
> - SERVICETAG_PRODUCTVERSION 3.4
> - SERVICETAG_PARENTNAME OpenOffice.org 3.4
> + SERVICETAG_PRODUCTNAME OpenOffice.org 3.5
> + SERVICETAG_PRODUCTVERSION 3.5
> + SERVICETAG_PARENTNAME OpenOffice.org 3.5
> SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
> SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
BTW:
IMHO another nice example to get rid of old and no longer needed code:
The Service Tag [1] implementation from what has Sun included.
It's very simple:
We don't want any registrations --> so we don't need Service Tags anymore.
[1]
http://www.oracle.com/technetwork/articles/javase/productregistration-142210.html
My 2 ct.
Marcus