Attachment #80212 for issue #119977

View | Details | Raw Unified | Return to issue 119977
Collapse All | Expand All




        variables
        {
            APACHEPROJECTNAME Apache OpenOffice
            OOOBASEVERSION 4.0
            OOOPACKAGEVERSION 4.0.0
            UREPACKAGEVERSION 4.0.0
            URELAYERVERSION 1
            BASISROOTNAME ApacheOpenOffice
            UNIXBASISROOTNAME apacheopenoffice

            OOOXMLFILEFORMATNAME OpenOffice.org XML
            OOOXMLFILEFORMATVERSION 1.0
            WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
            SERVICETAG_PRODUCTNAME Apache OpenOffice 4.0
            SERVICETAG_PRODUCTVERSION 4.0
            SERVICETAG_PARENTNAME Apache OpenOffice 4.0
            SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
            SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
            REGISTRATION_HOST https://registration.openoffice.org

        variables
        {
            PRODUCTNAME Apache OpenOffice
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
            BRANDPACKAGEVERSION 4
            USERDIRPRODUCTVERSION 4
            ABOUTBOXPRODUCTVERSION 4.0.0
            BASEPRODUCTVERSION 4.0
            PCPFILENAME openoffice.pcp
            UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
            REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
            ADDSYSTEMINTEGRATION 1
            EVAL
            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            GLOBALFILEGID gid_File_Lib_Vcl

        variables
        {
            PRODUCTNAME Apache OpenOffice
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
            BRANDPACKAGEVERSION 4
            USERDIRPRODUCTVERSION 4
            ABOUTBOXPRODUCTVERSION 4.0.0
            BASEPRODUCTVERSION 4.0
            UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
            REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
            ADDSYSTEMINTEGRATION 1
            EVAL
            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            WITHJREPRODUCT 1

        variables
        {
            PRODUCTNAME AOO-Developer-Build
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION 
            LONG_PRODUCTEXTENSION 
            SHORT_PRODUCTEXTENSION 

            UNIXBASISROOTNAME aoodev
            POSTVERSIONEXTENSION
            POSTVERSIONEXTENSIONUNIX
            BRANDPACKAGEVERSION 4
            USERDIRPRODUCTVERSION 4
            ABOUTBOXPRODUCTVERSION 4.0.0
            BASEPRODUCTVERSION 4.0
            DEVELOPMENTPRODUCT 1
            BASISPACKAGEPREFIX aoobasis-dev
            UREPACKAGEPREFIX aoodev
            SOLSUREPACKAGEPREFIX aoodev
            REGISTRYLAYERNAME LayerDev
            UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
            EVAL
            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            LICENSENAME ALv2
            GLOBALFILEGID gid_File_Lib_Vcl

        variables
        {
            PRODUCTNAME URE
            PRODUCTVERSION 4.0.0
            PACKAGEVERSION 4.0
            PACKAGEREVISION 1
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION

        variables
        {
            PRODUCTNAME Apache OpenOffice
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION
            SHORT_PRODUCTEXTENSION
            POSTVERSIONEXTENSION SDK
            POSTVERSIONEXTENSIONUNIX sdk
            BRANDPACKAGEVERSION 4
            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            PACK_INSTALLED 1
            POOLPRODUCT 0
            DMG_VOLUMEEXTENSION SDK
            DATABASENAME openofficeorg40sdk
            NO_README_IN_ROOTDIR 1
            LICENSENAME ALv2
            IGNOREDIRECTORYLAYER 1

        variables
        {
            PRODUCTNAME AOO-Developer-Build
            PRODUCTVERSION 4.0.0
            PRODUCTEXTENSION
            LONG_PRODUCTEXTENSION
            SHORT_PRODUCTEXTENSION

            UNIXBASISROOTNAME ooo-dev
            POSTVERSIONEXTENSION SDK
            POSTVERSIONEXTENSIONUNIX sdk
            BRANDPACKAGEVERSION 4
            PACKAGEVERSION 4.0.0
            PACKAGEREVISION {milestone}
            BASISPACKAGEPREFIX aoobasis-dev
            UREPACKAGEPREFIX aoodev

            PACK_INSTALLED 1
            POOLPRODUCT 0
            DMG_VOLUMEEXTENSION SDK
            DATABASENAME openofficeorg40devsdk
            NO_README_IN_ROOTDIR 1
            LICENSENAME ALv2
            IGNOREDIRECTORYLAYER 1




        "REM are necessary for building the examples of the Office Development Kit.\n" +
        "REM The Script was developed for the operating systems Windows.\n" +
        "REM The SDK name\n" +
        "REM Example: set OO_SDK_NAME=openoffice4.0_sdk\n" +
        "set OO_SDK_NAME=" + oo_sdk_name  +
        "\n\n" +
        "REM Installation directory of the Software Development Kit.\n" +
        "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 4.0\\sdk\n" +
        "set OO_SDK_HOME=" + oo_sdk_home  +
        "\n\n" +
        "REM Office installation directory.\n" +
        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +
        "set OFFICE_HOME=" + office_home +
        "\n\n" +
        "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +
        "set OFFICE_BASE_HOME=" + office_base_home +
        "\n\n" +
        "REM URE installation directory.\n" +

Lines 135-140 $(COMP_UNOPKG_DESCRIPTION) : xml/description.xml Link Here

(-)a/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/Makefile (+1 lines)
135	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \	135	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
136	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \	136	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
137	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \	137	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
		138	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
138	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \	139	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
139	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \	140	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
140	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \	141	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

Lines 19-26 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/project.mk (-2 / +3 lines)
19	#	19	#
20	#**************************************************************	20	#**************************************************************
21		21
22	DESCRIPTION_OOO_MIN_VER=3.5.0	22	DESCRIPTION_OOO_MIN_VER=4.0
23	DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)	23	DESCRIPTION_OOO_MAX_VER=4.9
		24	DESCRIPTION_DEP_NAME=Apache OpenOffice
24		25
25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus	26	EXTENSION_ID=org.apache.openoffice.framework.statusbar.ModifiedStatus
26	EXTENSION_VERSION=0.0.1	27	EXTENSION_VERSION=0.0.1

Lines 25-30 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/ModifiedStatusbarController/xml/description.xml (+1 lines)
25	<platform value="#EXTENSION_PLATFORM#"/>	25	<platform value="#EXTENSION_PLATFORM#"/>
26	<dependencies>	26	<dependencies>
27	<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>	27	<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
		28	<OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
28	</dependencies>	29	</dependencies>
29	<publisher>	30	<publisher>
30	<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>	31	<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

Lines 133-138 $(COMP_UNOPKG_DESCRIPTION) : xml/description.xml Link Here

(-)a/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/Makefile (+1 lines)
133	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \	133	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
134	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \	134	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
135	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \	135	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
		136	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
136	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \	137	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
137	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \	138	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
138	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \	139	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

Lines 19-26 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/project.mk (-2 / +3 lines)
19	#	19	#
20	#**************************************************************	20	#**************************************************************
21		21
22	DESCRIPTION_OOO_MIN_VER=3.5.0	22	DESCRIPTION_OOO_MIN_VER=4.0
23	DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)	23	DESCRIPTION_OOO_MAX_VER=4.9
		24	DESCRIPTION_DEP_NAME=Apache OpenOffice
24		25
25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode	26	EXTENSION_ID=org.apache.openoffice.framework.statusbar.SelectionMode
26	EXTENSION_VERSION=0.0.1	27	EXTENSION_VERSION=0.0.1

Lines 25-30 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/xml/description.xml (+1 lines)
25	<platform value="#EXTENSION_PLATFORM#"/>	25	<platform value="#EXTENSION_PLATFORM#"/>
26	<dependencies>	26	<dependencies>
27	<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>	27	<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
		28	<OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
28	</dependencies>	29	</dependencies>
29	<publisher>	30	<publisher>
30	<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>	31	<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

Lines 149-154 $(COMP_UNOPKG_DESCRIPTION) : xml/description.xml Link Here

(-)a/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/Makefile (+1 lines)
149	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \	149	-e "s/#DESCRIPTION_IDENTIFIER#/$(DESCRIPTION_IDENTIFIER)/" \
150	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \	150	-e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" \
151	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \	151	-e "s/#DESCRIPTION_OOO_MIN_VER#/$(DESCRIPTION_OOO_MIN_VER)/" \
		152	-e "s/#DESCRIPTION_OOO_MAX_VER#/$(DESCRIPTION_OOO_MAX_VER)/" \
152	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \	153	-e "s/#DESCRIPTION_DEP_NAME#/$(DESCRIPTION_DEP_NAME)/" \
153	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \	154	-e "s/#DESCRIPTION_PUBLISHER_URL#/$(subst /,\/,$(DESCRIPTION_PUBLISHER_URL))/" \
154	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \	155	-e "s/#DESCRIPTION_PUBLISHER_NAME#/$(DESCRIPTION_PUBLISHER_NAME)/" \

Lines 19-26 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/project.mk (-2 / +3 lines)
19	#	19	#
20	#**************************************************************	20	#**************************************************************
21		21
22	DESCRIPTION_OOO_MIN_VER=3.5.0	22	DESCRIPTION_OOO_MIN_VER=4.0
23	DESCRIPTION_DEP_NAME=Apache OpenOffice $(DESCRIPTION_OOO_MIN_VER)	23	DESCRIPTION_OOO_MAX_VER=4.9
		24	DESCRIPTION_DEP_NAME=Apache OpenOffice
24		25
25	EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount	26	EXTENSION_ID=org.apache.openoffice.framework.statusbar.StatusWordCount
26	EXTENSION_VERSION=0.0.1	27	EXTENSION_VERSION=0.0.1

Lines 25-30 Link Here

(-)a/main/odk/examples/cpp/StatusbarController/WordCountStatusbarController/xml/description.xml (+1 lines)
25	<platform value="#EXTENSION_PLATFORM#"/>	25	<platform value="#EXTENSION_PLATFORM#"/>
26	<dependencies>	26	<dependencies>
27	<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>	27	<OpenOffice.org-minimal-version value="#DESCRIPTION_OOO_MIN_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
		28	<OpenOffice.org-maximal-version value="#DESCRIPTION_OOO_MAX_VER#" d:name="#DESCRIPTION_DEP_NAME#"/>
28	</dependencies>	29	</dependencies>
29	<publisher>	30	<publisher>
30	<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>	31	<name xlink:href="#DESCRIPTION_PUBLISHER_URL#" lang="en">#DESCRIPTION_PUBLISHER_NAME#</name>

Lines 31-36 Link Here

(-)a/main/odk/examples/cpp/custompanel/description.xml (-1 / +2 lines)
31	<name>Custom Tool Panel Example</name>	31	<name>Custom Tool Panel Example</name>
32	</display-name>	32	</display-name>
33	<dependencies>	33	<dependencies>
34	<OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice 3.4"/>	34	<OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
		35	<OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
35	</dependencies>	36	</dependencies>
36	</description>	37	</description>

Lines 29-39 OO_SDK_NAME=@OO_SDK_NAME@ Link Here

(-)a/main/odk/setsdkenv_unix.sh.in (-2 / +2 lines)
29	export OO_SDK_NAME	29	export OO_SDK_NAME
30		30
31	# Installation directory of the Software Development Kit.	31	# Installation directory of the Software Development Kit.
32	# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis3.0/sdk	32	# Example: OO_SDK_HOME=/opt/apacheopenoffice/basis4.0/sdk
33	OO_SDK_HOME='@OO_SDK_HOME@'	33	OO_SDK_HOME='@OO_SDK_HOME@'
34		34
35	# Office installation directory.	35	# Office installation directory.
36	# Example: OFFICE_HOME=/opt/apacheopenoffice3	36	# Example: OFFICE_HOME=/opt/apacheopenoffice4
37	OFFICE_HOME='@OFFICE_HOME@'	37	OFFICE_HOME='@OFFICE_HOME@'
38	OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'	38	OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
39		39




REM are necessary for building the examples of the Office Development Kit.
REM The Script was developed for the operating systems Windows.
REM The SDK name
REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
set OO_SDK_NAME=apacheopenoffice4.0_sdk

REM Installation directory of the Software Development Kit.
REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk
set OO_SDK_HOME=

REM Office installation directory.
REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4
set OFFICE_HOME=

REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0
set OFFICE_BASE_HOME=

REM URE installation directory.

set OO_SDK_JAVA_HOME=

REM Special output directory
REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
set OO_SDK_OUT=

REM Automatic deployment

Lines 28-35 Link Here

(-)a/main/sdext/source/minimizer/description.xml (-2 / +2 lines)
28	<identifier value="UPDATED_IDENTIFIER"/>	28	<identifier value="UPDATED_IDENTIFIER"/>
29		29
30	<dependencies>	30	<dependencies>
31	<OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>	31	<OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
32	<OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>	32	<OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
33	</dependencies>	33	</dependencies>
34		34
35	<registration>	35	<registration>

Lines 27-34 Link Here

(-)a/main/sdext/source/pdfimport/config/description.xml (-2 / +2 lines)
27	<identifier value="UPDATED_IDENTIFIER" />	27	<identifier value="UPDATED_IDENTIFIER" />
28		28
29	<dependencies>	29	<dependencies>
30	<OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>	30	<OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
31	<OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>	31	<OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
32	</dependencies>	32	</dependencies>
33		33
34	<registration>	34	<registration>

Lines 28-35 Link Here

(-)a/main/sdext/source/presenter/description.xml (-2 / +2 lines)
28	<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />	28	<identifier value="com.sun.PresenterScreen-UPDATED_SUPPORTED_PLATFORM" />
29		29
30	<dependencies>	30	<dependencies>
31	<OpenOffice.org-minimal-version value="3.4" dep:name="Apache OpenOffice"/>	31	<OpenOffice.org-minimal-version value="4.0" dep:name="Apache OpenOffice"/>
32	<OpenOffice.org-maximal-version value="3.9" dep:name="Apache OpenOffice"/>	32	<OpenOffice.org-maximal-version value="4.9" dep:name="Apache OpenOffice"/>
33	</dependencies>	33	</dependencies>
34		34
35	<registration>	35	<registration>

Lines 18-25 Link Here

(-)a/main/solenv/inc/minor.mk (-4 / +4 lines)
18	# under the License.	18	# under the License.
19	#	19	#
20	# *************************************************************	20	# *************************************************************
21	RSCVERSION=350	21	RSCVERSION=400
22	RSCREVISION=350m1(Build:9611)	22	RSCREVISION=400m1(Build:9612)
23	BUILD=9611	23	BUILD=9612
24	LAST_MINOR=m1	24	LAST_MINOR=m1
25	SOURCEVERSION=AOO350	25	SOURCEVERSION=AOO400

Lines 19-28 Link Here

(-)a/main/solenv/inc/version.lst (-5 / +5 lines)
19	#	19	#
20	#**************************************************************	20	#**************************************************************
21		21
22	OOOBASEVERSIONMAJOR=3	22	OOOBASEVERSIONMAJOR=4
23	OOOBASEVERSIONMINOR=5	23	OOOBASEVERSIONMINOR=0
24	OOOBASEVERSIONMICRO=0	24	OOOBASEVERSIONMICRO=0
25		25
26	OOOBASEVERSIONDAY=1	26	OOOBASEVERSIONDAY=5
27	OOOBASEVERSIONMONTH=4	27	OOOBASEVERSIONMONTH=2
28	OOOBASEVERSIONYEAR=2012	28	OOOBASEVERSIONYEAR=2013

Lines 31-38 Link Here

(-)a/main/swext/mediawiki/src/description.xml (-2 / +2 lines)
31	</simple-license>	31	</simple-license>
32	</registration>	32	</registration>
33	<dependencies>	33	<dependencies>
34	<OpenOffice.org-minimal-version value="3.4" d:name="Apache OpenOffice"/>	34	<OpenOffice.org-minimal-version value="4.0" d:name="Apache OpenOffice"/>
35	<OpenOffice.org-maximal-version value="3.9" d:name="Apache OpenOffice"/>	35	<OpenOffice.org-maximal-version value="4.9" d:name="Apache OpenOffice"/>
36	</dependencies>	36	</dependencies>
37	<publisher>	37	<publisher>
38	<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>	38	<name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>

Lines 47-56 PRODUCTLIST = apache_openoffice Link Here

(-)a/main/sysui/desktop/productversion.mk (-2 / +2 lines)
47	# default values to minimize maintainance effort	47	# default values to minimize maintainance effort
48		48
49	# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)	49	# CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!)
50	PRODUCTVERSION = 3.5	50	PRODUCTVERSION = 4.0
51		51
52	# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)	52	# CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!)
53	PRODUCTVERSIONSHORT = 3	53	PRODUCTVERSIONSHORT = 4
54		54
55	PKGVERSION = $(PRODUCTVERSION)	55	PKGVERSION = $(PRODUCTVERSION)
56	# gnome-vfs treats everything behind the last '.' as an icon extension,	56	# gnome-vfs treats everything behind the last '.' as an icon extension,

Return to issue 119977

Lines 5-13 Globals Link Here

(-)a/main/instsetoo_native/util/openoffice.lst (-37 / +37 lines)
5	variables	5	variables
6	{	6	{
7	APACHEPROJECTNAME Apache OpenOffice	7	APACHEPROJECTNAME Apache OpenOffice
8	OOOBASEVERSION 3.5	8	OOOBASEVERSION 4.0
9	OOOPACKAGEVERSION 3.5.0	9	OOOPACKAGEVERSION 4.0.0
10	UREPACKAGEVERSION 3.5.0	10	UREPACKAGEVERSION 4.0.0
11	URELAYERVERSION 1	11	URELAYERVERSION 1
12	BASISROOTNAME ApacheOpenOffice	12	BASISROOTNAME ApacheOpenOffice
13	UNIXBASISROOTNAME apacheopenoffice	13	UNIXBASISROOTNAME apacheopenoffice
Lines 40-48 Globals Link Here
40	OOOXMLFILEFORMATNAME OpenOffice.org XML	40	OOOXMLFILEFORMATNAME OpenOffice.org XML
41	OOOXMLFILEFORMATVERSION 1.0	41	OOOXMLFILEFORMATVERSION 1.0
42	WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1	42	WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
43	SERVICETAG_PRODUCTNAME Apache OpenOffice 3.5	43	SERVICETAG_PRODUCTNAME Apache OpenOffice 4.0
44	SERVICETAG_PRODUCTVERSION 3.5	44	SERVICETAG_PRODUCTVERSION 4.0
45	SERVICETAG_PARENTNAME Apache OpenOffice 3.5	45	SERVICETAG_PARENTNAME Apache OpenOffice 4.0
46	SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})	46	SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
47	SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93	47	SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
48	REGISTRATION_HOST https://registration.openoffice.org	48	REGISTRATION_HOST https://registration.openoffice.org
Lines 59-81 Apache_OpenOffice Link Here
59	variables	59	variables
60	{	60	{
61	PRODUCTNAME Apache OpenOffice	61	PRODUCTNAME Apache OpenOffice
62	PRODUCTVERSION 3.5.0	62	PRODUCTVERSION 4.0.0
63	PRODUCTEXTENSION	63	PRODUCTEXTENSION
64	LONG_PRODUCTEXTENSION	64	LONG_PRODUCTEXTENSION
65	SHORT_PRODUCTEXTENSION	65	SHORT_PRODUCTEXTENSION
66	POSTVERSIONEXTENSION	66	POSTVERSIONEXTENSION
67	POSTVERSIONEXTENSIONUNIX	67	POSTVERSIONEXTENSIONUNIX
68	BRANDPACKAGEVERSION 3	68	BRANDPACKAGEVERSION 4
69	USERDIRPRODUCTVERSION 3	69	USERDIRPRODUCTVERSION 4
70	ABOUTBOXPRODUCTVERSION 3.5.0	70	ABOUTBOXPRODUCTVERSION 4.0.0
71	BASEPRODUCTVERSION 3.5	71	BASEPRODUCTVERSION 4.0
72	PCPFILENAME openoffice.pcp	72	PCPFILENAME openoffice.pcp
73	UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update	73	UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
74	ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst	74	ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
75	REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt	75	REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
76	ADDSYSTEMINTEGRATION 1	76	ADDSYSTEMINTEGRATION 1
77	EVAL	77	EVAL
78	PACKAGEVERSION 3.5.0	78	PACKAGEVERSION 4.0.0
79	PACKAGEREVISION {milestone}	79	PACKAGEREVISION {milestone}
80	LICENSENAME ALv2	80	LICENSENAME ALv2
81	GLOBALFILEGID gid_File_Lib_Vcl	81	GLOBALFILEGID gid_File_Lib_Vcl
Lines 118-139 Apache_OpenOffice_wJRE Link Here
118	variables	118	variables
119	{	119	{
120	PRODUCTNAME Apache OpenOffice	120	PRODUCTNAME Apache OpenOffice
121	PRODUCTVERSION 3.5.0	121	PRODUCTVERSION 4.0.0
122	PRODUCTEXTENSION	122	PRODUCTEXTENSION
123	LONG_PRODUCTEXTENSION	123	LONG_PRODUCTEXTENSION
124	SHORT_PRODUCTEXTENSION	124	SHORT_PRODUCTEXTENSION
125	POSTVERSIONEXTENSION	125	POSTVERSIONEXTENSION
126	POSTVERSIONEXTENSIONUNIX	126	POSTVERSIONEXTENSIONUNIX
127	BRANDPACKAGEVERSION 3	127	BRANDPACKAGEVERSION 4
128	USERDIRPRODUCTVERSION 3	128	USERDIRPRODUCTVERSION 4
129	ABOUTBOXPRODUCTVERSION 3.5.0	129	ABOUTBOXPRODUCTVERSION 4.0.0
130	BASEPRODUCTVERSION 3.5	130	BASEPRODUCTVERSION 4.0
131	UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update	131	UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
132	ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst	132	ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
133	REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt	133	REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
134	ADDSYSTEMINTEGRATION 1	134	ADDSYSTEMINTEGRATION 1
135	EVAL	135	EVAL
136	PACKAGEVERSION 3.5.0	136	PACKAGEVERSION 4.0.0
137	PACKAGEREVISION {milestone}	137	PACKAGEREVISION {milestone}
138	LICENSENAME ALv2	138	LICENSENAME ALv2
139	WITHJREPRODUCT 1	139	WITHJREPRODUCT 1
Lines 177-183 Apache_OpenOffice_Dev Link Here
177	variables	177	variables
178	{	178	{
179	PRODUCTNAME AOO-Developer-Build	179	PRODUCTNAME AOO-Developer-Build
180	PRODUCTVERSION 3.5.0	180	PRODUCTVERSION 4.0.0
181	PRODUCTEXTENSION	181	PRODUCTEXTENSION
182	LONG_PRODUCTEXTENSION	182	LONG_PRODUCTEXTENSION
183	SHORT_PRODUCTEXTENSION	183	SHORT_PRODUCTEXTENSION
Lines 185-203 Apache_OpenOffice_Dev Link Here
185	UNIXBASISROOTNAME aoodev	185	UNIXBASISROOTNAME aoodev
186	POSTVERSIONEXTENSION	186	POSTVERSIONEXTENSION
187	POSTVERSIONEXTENSIONUNIX	187	POSTVERSIONEXTENSIONUNIX
188	BRANDPACKAGEVERSION 3	188	BRANDPACKAGEVERSION 4
189	USERDIRPRODUCTVERSION 3	189	USERDIRPRODUCTVERSION 4
190	ABOUTBOXPRODUCTVERSION 3.5.0	190	ABOUTBOXPRODUCTVERSION 4.0.0
191	BASEPRODUCTVERSION 3.5	191	BASEPRODUCTVERSION 4.0
192	DEVELOPMENTPRODUCT 1	192	DEVELOPMENTPRODUCT 1
193	BASISPACKAGEPREFIX aoobasis-dev	193	BASISPACKAGEPREFIX aoobasis-dev
194	UREPACKAGEPREFIX aoodev	194	UREPACKAGEPREFIX aoodev
195	SOLSUREPACKAGEPREFIX aoodev	195	SOLSUREPACKAGEPREFIX aoodev
196	REGISTRYLAYERNAME LayerDev	196	REGISTRYLAYERNAME LayerDev
197	UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update	197	UPDATEURL http://www.openoffice.org/projects/update/aoo40/check.Update
198	ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst	198	ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
199	EVAL	199	EVAL
200	PACKAGEVERSION 3.5.0	200	PACKAGEVERSION 4.0.0
201	PACKAGEREVISION {milestone}	201	PACKAGEREVISION {milestone}
202	LICENSENAME ALv2	202	LICENSENAME ALv2
203	GLOBALFILEGID gid_File_Lib_Vcl	203	GLOBALFILEGID gid_File_Lib_Vcl
Lines 245-252 URE Link Here
245	variables	245	variables
246	{	246	{
247	PRODUCTNAME URE	247	PRODUCTNAME URE
248	PRODUCTVERSION 3.5.0	248	PRODUCTVERSION 4.0.0
249	PACKAGEVERSION 3.5	249	PACKAGEVERSION 4.0
250	PACKAGEREVISION 1	250	PACKAGEREVISION 1
251	PRODUCTEXTENSION	251	PRODUCTEXTENSION
252	LONG_PRODUCTEXTENSION	252	LONG_PRODUCTEXTENSION
Lines 287-305 Apache_OpenOffice_SDK Link Here
287	variables	287	variables
288	{	288	{
289	PRODUCTNAME Apache OpenOffice	289	PRODUCTNAME Apache OpenOffice
290	PRODUCTVERSION 3.5.0	290	PRODUCTVERSION 4.0.0
291	PRODUCTEXTENSION	291	PRODUCTEXTENSION
292	LONG_PRODUCTEXTENSION	292	LONG_PRODUCTEXTENSION
293	SHORT_PRODUCTEXTENSION	293	SHORT_PRODUCTEXTENSION
294	POSTVERSIONEXTENSION SDK	294	POSTVERSIONEXTENSION SDK
295	POSTVERSIONEXTENSIONUNIX sdk	295	POSTVERSIONEXTENSIONUNIX sdk
296	BRANDPACKAGEVERSION 3	296	BRANDPACKAGEVERSION 4
297	PACKAGEVERSION 3.5.0	297	PACKAGEVERSION 4.0.0
298	PACKAGEREVISION {milestone}	298	PACKAGEREVISION {milestone}
299	PACK_INSTALLED 1	299	PACK_INSTALLED 1
300	POOLPRODUCT 0	300	POOLPRODUCT 0
301	DMG_VOLUMEEXTENSION SDK	301	DMG_VOLUMEEXTENSION SDK
302	DATABASENAME openofficeorg34sdk	302	DATABASENAME openofficeorg40sdk
303	NO_README_IN_ROOTDIR 1	303	NO_README_IN_ROOTDIR 1
304	LICENSENAME ALv2	304	LICENSENAME ALv2
305	IGNOREDIRECTORYLAYER 1	305	IGNOREDIRECTORYLAYER 1
Lines 334-340 Apache_OpenOffice_Dev_SDK Link Here
334	variables	334	variables
335	{	335	{
336	PRODUCTNAME AOO-Developer-Build	336	PRODUCTNAME AOO-Developer-Build
337	PRODUCTVERSION 3.5.0	337	PRODUCTVERSION 4.0.0
338	PRODUCTEXTENSION	338	PRODUCTEXTENSION
339	LONG_PRODUCTEXTENSION	339	LONG_PRODUCTEXTENSION
340	SHORT_PRODUCTEXTENSION	340	SHORT_PRODUCTEXTENSION
Lines 342-349 Apache_OpenOffice_Dev_SDK Link Here
342	UNIXBASISROOTNAME ooo-dev	342	UNIXBASISROOTNAME ooo-dev
343	POSTVERSIONEXTENSION SDK	343	POSTVERSIONEXTENSION SDK
344	POSTVERSIONEXTENSIONUNIX sdk	344	POSTVERSIONEXTENSIONUNIX sdk
345	BRANDPACKAGEVERSION 3	345	BRANDPACKAGEVERSION 4
346	PACKAGEVERSION 3.5.0	346	PACKAGEVERSION 4.0.0
347	PACKAGEREVISION {milestone}	347	PACKAGEREVISION {milestone}
348	BASISPACKAGEPREFIX aoobasis-dev	348	BASISPACKAGEPREFIX aoobasis-dev
349	UREPACKAGEPREFIX aoodev	349	UREPACKAGEPREFIX aoodev
Lines 353-359 Apache_OpenOffice_Dev_SDK Link Here
353	PACK_INSTALLED 1	353	PACK_INSTALLED 1
354	POOLPRODUCT 0	354	POOLPRODUCT 0
355	DMG_VOLUMEEXTENSION SDK	355	DMG_VOLUMEEXTENSION SDK
356	DATABASENAME openofficeorg35devsdk	356	DATABASENAME openofficeorg40devsdk
357	NO_README_IN_ROOTDIR 1	357	NO_README_IN_ROOTDIR 1
358	LICENSENAME ALv2	358	LICENSENAME ALv2
359	IGNOREDIRECTORYLAYER 1	359	IGNOREDIRECTORYLAYER 1

Lines 919-936 function writeBatFile(fdir, file) Link Here

(-)a/main/odk/cfgWin.js (-4 / +4 lines)
919	"REM are necessary for building the examples of the Office Development Kit.\n" +	919	"REM are necessary for building the examples of the Office Development Kit.\n" +
920	"REM The Script was developed for the operating systems Windows.\n" +	920	"REM The Script was developed for the operating systems Windows.\n" +
921	"REM The SDK name\n" +	921	"REM The SDK name\n" +
922	"REM Example: set OO_SDK_NAME=openoffice3.0_sdk\n" +	922	"REM Example: set OO_SDK_NAME=openoffice4.0_sdk\n" +
923	"set OO_SDK_NAME=" + oo_sdk_name +	923	"set OO_SDK_NAME=" + oo_sdk_name +
924	"\n\n" +	924	"\n\n" +
925	"REM Installation directory of the Software Development Kit.\n" +	925	"REM Installation directory of the Software Development Kit.\n" +
926	"REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 3.0\\sdk\n" +	926	"REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 4.0\\sdk\n" +
927	"set OO_SDK_HOME=" + oo_sdk_home +	927	"set OO_SDK_HOME=" + oo_sdk_home +
928	"\n\n" +	928	"\n\n" +
929	"REM Office installation directory.\n" +	929	"REM Office installation directory.\n" +
930	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 3\n" +	930	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 4\n" +
931	"set OFFICE_HOME=" + office_home +	931	"set OFFICE_HOME=" + office_home +
932	"\n\n" +	932	"\n\n" +
933	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.0\n" +	933	"REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 4.0\n" +
934	"set OFFICE_BASE_HOME=" + office_base_home +	934	"set OFFICE_BASE_HOME=" + office_base_home +
935	"\n\n" +	935	"\n\n" +
936	"REM URE installation directory.\n" +	936	"REM URE installation directory.\n" +

Lines 23-40 REM This script sets all enviroment variables, which Link Here

(-)a/main/odk/setsdkenv_windows.template (-6 / +6 lines)
23	REM are necessary for building the examples of the Office Development Kit.	23	REM are necessary for building the examples of the Office Development Kit.
24	REM The Script was developed for the operating systems Windows.	24	REM The Script was developed for the operating systems Windows.
25	REM The SDK name	25	REM The SDK name
26	REM Example: set OO_SDK_NAME=apacheopenoffice3.0_sdk	26	REM Example: set OO_SDK_NAME=apacheopenoffice4.0_sdk
27	set OO_SDK_NAME=apacheopenoffice3.0_sdk	27	set OO_SDK_NAME=apacheopenoffice4.0_sdk
28		28
29	REM Installation directory of the Software Development Kit.	29	REM Installation directory of the Software Development Kit.
30	REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 3.0\sdk	30	REM Example: set OO_SDK_HOME=C:\Program Files\Apache OpenOffice\Basic 4.0\sdk
31	set OO_SDK_HOME=	31	set OO_SDK_HOME=
32		32
33	REM Office installation directory.	33	REM Office installation directory.
34	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 3	34	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice 4
35	set OFFICE_HOME=	35	set OFFICE_HOME=
36		36
37	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 3.0	37	REM Example: set OFFICE_HOME=C:\Program Files\Apache OpenOffice\Basis 4.0
38	set OFFICE_BASE_HOME=	38	set OFFICE_BASE_HOME=
39		39
40	REM URE installation directory.	40	REM URE installation directory.
Lines 73-79 REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05 Link Here
73	set OO_SDK_JAVA_HOME=	73	set OO_SDK_JAVA_HOME=
74		74
75	REM Special output directory	75	REM Special output directory
76	REM Example: set OO_SDK_OUT=C:\apacheopenoffice3.0_sdk	76	REM Example: set OO_SDK_OUT=C:\apacheopenoffice4.0_sdk
77	set OO_SDK_OUT=	77	set OO_SDK_OUT=
78		78
79	REM Automatic deployment	79	REM Automatic deployment

Lines 41-47 TARGET=debian Link Here

(-)a/main/sysui/desktop/debian/makefile.mk (-10 / +10 lines)
41		41
42	.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"	42	.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
43		43
44	DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.5-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)	44	DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i4.0-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
45		45
46	.ENDIF	46	.ENDIF
47		47
Lines 56-77 ALLTAR : $(DEBFILES) Link Here
56		56
57	%/DEBIAN/control : $$(@:f)	57	%/DEBIAN/control : $$(@:f)
58	@$(MKDIRHIER) $(@:d) $$/etc $$/usr/share/applnk/Office $*$/usr/lib/menu	58	@$(MKDIRHIER) $(@:d) $$/etc $$/usr/share/applnk/Office $*$/usr/lib/menu
59	ln -sf /opt/$(UNIXFILENAME.$(:f:s/-/ /:1:s/3.5//)) $$/etc$/	59	ln -sf /opt/$(UNIXFILENAME.$(:f:s/-/ /:1:s/4.0//)) $$/etc$/
60	/bin/sh -c -x "cd $(COMMONMISC)$/$(:f:s/-/ /:1:s/3.5//) && DESTDIR=$(shell @cd $; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"	60	/bin/sh -c -x "cd $(COMMONMISC)$/$(:f:s/-/ /:1:s/4.0//) && DESTDIR=$(shell @cd $; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
61	@cat openoffice.org-debian-menus \| sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(:f:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(:f:s/-/ /:1:s/3.5//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(:f:s/-/ /:1:s/3.5//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(:f:s/-/ /:1:s/3.5//))/' > $$/usr/lib/menu/$(:f:s/_/ /:1:s/3.5//)	61	@cat openoffice.org-debian-menus \| sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(:f:s/-/ /:1:s/4.0//)) $(PRODUCTVERSION.$(:f:s/-/ /:1:s/4.0//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(:f:s/-/ /:1:s/4.0//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(:f:s/-/ /:1:s/4.0//))/' > $$/usr/lib/menu/$(:f:s/_/ /:1:s/4.0//)
62	echo "Package: $(*:f:s/_/ /:1:s/3.5//)" > $@	62	echo "Package: $(*:f:s/_/ /:1:s/4.0//)" > $@
63	cat $(@:f) \| tr -d "\015" \| sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//))/" >> $@	63	cat $(@:f) \| tr -d "\015" \| sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.0//))/" >> $@
64	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.5//))-$(PKGREV)" >> $@	64	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/4.0//))-$(PKGREV)" >> $@
65	@du -k -s $* \| awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@	65	@du -k -s $* \| awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@
66		66
67	%/DEBIAN/postinst : $$(@:f)	67	%/DEBIAN/postinst : $$(@:f)
68	@cat $< \| tr -d "\015" \| sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@	68	@cat $< \| tr -d "\015" \| sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@
69		69
70	%/DEBIAN/postrm : $$(@:f)	70	%/DEBIAN/postrm : $$(@:f)
71	@cat $< \| tr -d "\015" \| sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@	71	@cat $< \| tr -d "\015" \| sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@
72		72
73	%/DEBIAN/prerm : $$(@:f)	73	%/DEBIAN/prerm : $$(@:f)
74	@cat $< \| tr -d "\015" \| sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@	74	@cat $< \| tr -d "\015" \| sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.0//))/g" > $@
75		75
76	# --- packaging ---------------------------------------------------	76	# --- packaging ---------------------------------------------------
77		77

Lines 36-42 TARGET=slackware Link Here

(-)a/main/sysui/desktop/slackware/makefile.mk (-10 / +10 lines)
36		36
37	# --- Files --------------------------------------------------------	37	# --- Files --------------------------------------------------------
38		38
39	MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}3.5-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz	39	MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}4.0-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz
40		40
41	# --- Targets -------------------------------------------------------	41	# --- Targets -------------------------------------------------------
42		42
Lines 55-80 $(MISC)/$(TARGET)/usr/share/applications/ : Link Here
55	# FIXME: removal of -extension. only to create identical packages to OOF680	55	# FIXME: removal of -extension. only to create identical packages to OOF680
56	%/usr/share/applications :	56	%/usr/share/applications :
57	@$(MKDIRHIER) $@	57	@$(MKDIRHIER) $@
58	/bin/sh -c "cd $(COMMONMISC)$/$(:b:s/-/ /:1:s/3.5//); DESTDIR=$(shell @cd $; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/3.5//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"	58	/bin/sh -c "cd $(COMMONMISC)$/$(:b:s/-/ /:1:s/4.0//); DESTDIR=$(shell @cd $; pwd) GNOMEDIR="" ICON_PREFIX=$(ICONPREFIX.$(*:b:s/-/ /:1:s/4.0//)) KDEMAINDIR=/opt/kde .$/create_tree.sh"
59	$(RM) $$/opt$/kde$/share$/icons$/$/$/$/*-extension.png	59	$(RM) $$/opt$/kde$/share$/icons$/$/$/$/*-extension.png
60	$(RM) $$/opt$/kde$/share$/mimelnk$/application$/-extension.desktop	60	$(RM) $$/opt$/kde$/share$/mimelnk$/application$/-extension.desktop
61	$(RM) $$/usr$/share$/applications$/.desktop	61	$(RM) $$/usr$/share$/applications$/.desktop
62	$(RM) $*$/usr$/bin$/soffice	62	$(RM) $*$/usr$/bin$/soffice
63		63
64	%$/install$/doinst.sh : update-script	64	%$/install$/doinst.sh : update-script
65	@echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//)) )" > $@	65	@echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//)) )" > $@
66	@echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(:b:s/-/ /:1:s/3.5//):s/-//) $(UNIXFILENAME.$(:b:s/-/ /:1:s/3.5//)) )" >> $@	66	@echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(:b:s/-/ /:1:s/4.0//):s/-//) $(UNIXFILENAME.$(:b:s/-/ /:1:s/4.0//)) )" >> $@
67	@echo "( cd usr/bin ; rm -rf soffice )" >> $@	67	@echo "( cd usr/bin ; rm -rf soffice )" >> $@
68	@echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/program/soffice soffice )" >> $@	68	@echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/program/soffice soffice )" >> $@
69	@echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(:b:s/-/ /:1:s/3.5//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(:b:s/-/ /:1:s/3.5//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(:b:s/-/ /:1:s/3.5//))/share/xdg/$i $(UNIXFILENAME.$(:b:s/-/ /:1:s/3.5//))-$i )") >> $@	69	@echo -e $(foreach,i,$(shell @cat $(COMMONMISC)$/$(:b:s/-/ /:1:s/4.0//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(:b:s/-/ /:1:s/4.0//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(:b:s/-/ /:1:s/4.0//))/share/xdg/$i $(UNIXFILENAME.$(:b:s/-/ /:1:s/4.0//))-$i )") >> $@
70	@cat $< >> $@	70	@cat $< >> $@
71		71
72	%$/install$/slack-desc : slack-desc	72	%$/install$/slack-desc : slack-desc
73	@$(MKDIRHIER) $(@:d)	73	@$(MKDIRHIER) $(@:d)
74	@sed -e "s/PKGNAME/$(:b:s/-/ /:1:s/3.5//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(:b:s/-/ /:1:s/3.5//))/g" \	74	@sed -e "s/PKGNAME/$(:b:s/-/ /:1:s/4.0//)-$(TARGET)-menus/g" -e "s/PKGVERSION/$(PKGVERSION.$(:b:s/-/ /:1:s/4.0//))/g" \
75	-e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(:b:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(:b:s/-/ /:1:s/3.5//))/g" \	75	-e "s/LONGPRODUCTNAME/$(PRODUCTNAME.$(:b:s/-/ /:1:s/4.0//)) $(PRODUCTVERSION.$(:b:s/-/ /:1:s/4.0//))/g" \
76	-e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/3.5//))/g" \	76	-e "s/PRODUCTNAME/$(PRODUCTNAME.$(*:b:s/-/ /:1:s/4.0//))/g" \
77	-e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.5//))/g" $< > $@	77	-e "s/UNIXFILENAME/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/4.0//))/g" $< > $@
78		78
79	# needed to satisfy the slackware package tools - they need	79	# needed to satisfy the slackware package tools - they need
80	# the entries like this	80	# the entries like this