You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [15/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Modified: openoffice/branches/ia2/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt (original)
+++ openoffice/branches/ia2/main/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt Fri Feb 1 08:46:00 2013
@@ -1,7 +1,7 @@
Signature_ Root Key Name Type
s72 i2 s255 S255 I2
RegLocator Signature_
-basisinstalluser 1 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstalluser_ 1 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine 2 Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
-basisinstallmachine_ 2 Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser 1 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstalluser_ 1 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine 2 Software\Apache OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
+basisinstallmachine_ 2 Software\Apache OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2
Modified: openoffice/branches/ia2/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/instsetoo_native/util/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/branches/ia2/main/instsetoo_native/util/makefile.mk Fri Feb 1 08:46:00 2013
@@ -195,33 +195,33 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(AD
.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
openoffice_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
openofficewithjre_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Aapche_OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
openofficedev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product Apache_OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooolanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
sdkoo_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
$(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
ure_%{$(PKGFORMAT:^".")} :
Modified: openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/branches/ia2/main/instsetoo_native/util/openoffice.lst Fri Feb 1 08:46:00 2013
@@ -1,250 +1,240 @@
Globals
{
- Settings
- {
- variables
- {
- OOOBASEVERSION 3.5
- OOOPACKAGEVERSION 3.5.0
- UREPACKAGEVERSION 3.5.0
- URELAYERVERSION 1
- BASISROOTNAME OpenOffice.org
- UNIXBASISROOTNAME openoffice.org
- 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
- PACKAGEPREFIX
- BASISPACKAGEPREFIX ooobasis
- UREPACKAGEPREFIX openoffice.org
- SOLSUREPACKAGEPREFIX openofficeorg
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- POOLPRODUCT 1
- REGISTRATION_HOST https://registration.openoffice.org
- REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
- PROGRESSBARCOLOR 14,133,205
- PROGRESSSIZE 320,7
- PROGRESSPOSITION 185,206
- PROGRESSFRAMECOLOR 207,208,211
- NATIVEPROGRESS true
- REGISTRYLAYERNAME Layers
- SERVICEPACK 1
- UPDATE_DATABASE 1
- CREATE_MSP_INSTALLSET 0
- UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
- PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 8
- OOOVENDOR Apache Software Foundation
- OOODOWNLOADNAME 1
- STARTCENTER_LAYOUT_STYLE 0
- NOLANGUAGESELECTIONPRODUCT 0
- BUILDIDCWS {buildidcws}
+ Settings
+ {
+ variables
+ {
+ APACHEPROJECTNAME Apache OpenOffice
+ OOOBASEVERSION 3.5
+ OOOPACKAGEVERSION 3.5.0
+ UREPACKAGEVERSION 3.5.0
+ URELAYERVERSION 1
+ BASISROOTNAME ApacheOpenOffice
+ UNIXBASISROOTNAME apacheopenoffice
+ HIDELICENSEDIALOG 1
+ PACKAGEPREFIX
+ BASISPACKAGEPREFIX aoobasis
+ UREPACKAGEPREFIX apacheopenoffice
+ SOLSUREPACKAGEPREFIX apacheopenoffice
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.5.0
+ POOLPRODUCT 1
+ PROGRESSBARCOLOR 14,133,205
+ PROGRESSSIZE 320,7
+ PROGRESSPOSITION 185,206
+ PROGRESSFRAMECOLOR 207,208,211
+ NATIVEPROGRESS true
+ REGISTRYLAYERNAME Layers
+ SERVICEPACK 1
+ UPDATE_DATABASE 1
+ CREATE_MSP_INSTALLSET 0
+ UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
+ PACKAGEMAP package_names.txt,package_names_ext.txt
+ WINDOWSPATCHLEVEL 8
+ OOOVENDOR Apache Software Foundation
+ AOODOWNLOADNAME 1
+ STARTCENTER_LAYOUT_STYLE 0
+ NOLANGUAGESELECTIONPRODUCT 0
+ BUILDIDCWS {buildidcws}
OPENSOURCE 1
- }
- }
+ OOOXMLFILEFORMATNAME OpenOffice.org XML
+ OOOXMLFILEFORMATVERSION 1.0
+ WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
+ SERVICETAG_PRODUCTNAME Apache OpenOffice 3.5
+ SERVICETAG_PRODUCTVERSION 3.5
+ SERVICETAG_PARENTNAME Apache OpenOffice 3.5
+ SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
+ SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
+ REGISTRATION_HOST https://registration.openoffice.org
+ REGISTRATION_PRODUCT OpenOffice.org
+ REGISTRATION_CID 926117
+ }
+ }
}
-OpenOffice
+Apache_OpenOffice
{
- Settings
- {
- variables
- {
- PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.5
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME Apache OpenOffice
+ PRODUCTVERSION 3.5.0
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ 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
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
- PACKAGEREVISION {milestone}
- LICENSENAME ALv2
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooo_patchcodes.txt
- DOWNLOADBANNER ooobanner.bmp
- DOWNLOADBITMAP ooobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
- STARTCENTER_INFO_URL http://www.openoffice.org
- STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.openoffice.org/dictionaries
- }
- active 1
- compression 5
- script setup_osl
- downloadname Apache_OpenOffice_{productversion}_{os}_install_{languages}
- langpackdownloadname Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
+ UPDATEURL http://www.openoffice.org/projects/update/aoo35/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 3.5.0
+ PACKAGEREVISION {milestone}
+ LICENSENAME ALv2
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ AOODOWNLOADNAME 1
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.5.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ DOWNLOADBANNER ooobanner.bmp
+ DOWNLOADBITMAP ooobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+ STARTCENTER_LAYOUT_STYLE 0
+ DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname Apache_OpenOffice_{productversion}_{os}_install_{languages}
+ langpackdownloadname Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ }
}
-OpenOffice_wJRE
+Apache_OpenOffice_wJRE
{
- Settings
- {
- variables
- {
- PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.5
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- 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
- REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
- ADDSYSTEMINTEGRATION 1
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
- PACKAGEREVISION {milestone}
- LICENSENAME ALv2
- WITHJREPRODUCT 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooo_patchcodes.txt
- JAVAPRODUCT 1
- DOWNLOADBANNER ooobanner.bmp
- DOWNLOADBITMAP ooobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
- STARTCENTER_INFO_URL http://www.openoffice.org
- STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.openoffice.org/dictionaries
- }
- active 1
- compression 5
- script setup_osljre
- downloadname Apache_OpenOffice_{productversion}_{os}_installwjre_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME Apache OpenOffice
+ PRODUCTVERSION 3.5.0
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
+ UPDATEURL http://www.openoffice.org/projects/update/aoo35/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 3.5.0
+ PACKAGEREVISION {milestone}
+ LICENSENAME ALv2
+ WITHJREPRODUCT 1
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ AOODOWNLOADNAME 1
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice_wJRE
+ XPDINSTALLER 1
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.5.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ JAVAPRODUCT 1
+ DOWNLOADBANNER ooobanner.bmp
+ DOWNLOADBITMAP ooobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+ STARTCENTER_LAYOUT_STYLE 0
+ DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+ }
+ active 1
+ compression 5
+ script setup_osljre
+ downloadname Apache_OpenOffice_{productversion}_{os}_installwjre_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ }
}
-OpenOffice_Dev
+Apache_OpenOffice_Dev
{
- Settings
- {
- variables
- {
- PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.5
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- BASISROOTNAME OOo-dev
- UNIXBASISROOTNAME ooo-dev
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.0
- BASEPRODUCTVERSION 3.5
- DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
- REGISTRYLAYERNAME LayerDev
- SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
- 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
- EVAL
- FILEFORMATNAME OpenOffice.org
- FILEFORMATVERSION 1.0
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.0
- PACKAGEREVISION {milestone}
- LICENSENAME ALv2
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- SETSTATICPATH 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- JAVAPRODUCT 0
- LIBRARYVERSION 9.4.0
- PATCHCODEFILE ooodev_patchcodes.txt
- CODEFILENAME codes_ooodev.txt
- DOWNLOADBANNER ooobanner.bmp
- DOWNLOADBITMAP ooobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
- STARTCENTER_INFO_URL http://www.openoffice.org
- STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT OpenOffice.org
- REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.openoffice.org/dictionaries
- }
- active 1
- compression 5
- script setup_osl
- downloadname Apache_OpenOffice-dev_{productversion}_{os}_install_{languages}
- langpackdownloadname Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
+ Settings
+ {
+ variables
+ {
+ PRODUCTNAME AOO-Developer-Build
+ PRODUCTVERSION 3.5.0
+ PRODUCTEXTENSION
+ LONG_PRODUCTEXTENSION
+ SHORT_PRODUCTEXTENSION
+ BASISROOTNAME AOOdev
+ UNIXBASISROOTNAME aoodev
+ POSTVERSIONEXTENSION
+ POSTVERSIONEXTENSIONUNIX
+ BRANDPACKAGEVERSION 3
+ USERDIRPRODUCTVERSION 3
+ ABOUTBOXPRODUCTVERSION 3.5.0
+ BASEPRODUCTVERSION 3.5
+ DEVELOPMENTPRODUCT 1
+ BASISPACKAGEPREFIX aoobasis-dev
+ UREPACKAGEPREFIX aoodev
+ SOLSUREPACKAGEPREFIX aoodev
+ REGISTRYLAYERNAME LayerDev
+ UPDATEURL http://www.openoffice.org/projects/update/aoo35/check.Update
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+ EVAL
+ PACKAGEVERSION 3.5.0
+ PACKAGEREVISION {milestone}
+ LICENSENAME ALv2
+ GLOBALFILEGID gid_File_Lib_Vcl
+ GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
+ SPELLCHECKERFILE spellchecker_selection.txt
+ OPENSOURCE 1
+ SETSTATICPATH 1
+ AOODOWNLOADNAME 1
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Dev
+ XPDINSTALLER 0
+ BETAUPGRADECODE
+ STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
+ CHANGETARGETDIR 1
+ USE_FILEVERSION 1
+ JAVAPRODUCT 0
+ LIBRARYVERSION 9.5.0
+ PATCHCODEFILE ooodev_patchcodes.txt
+ CODEFILENAME codes_ooodev.txt
+ DOWNLOADBANNER ooobanner.bmp
+ DOWNLOADBITMAP ooobitmap.bmp
+ DOWNLOADSETUPICO ooosetup.ico
+ LOCALUSERDIR $ORIGIN/..
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+ STARTCENTER_LAYOUT_STYLE 0
+ DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+ SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
+ }
+ active 1
+ compression 5
+ script setup_osl
+ downloadname Apache_OpenOffice-dev_{productversion}_{os}_install_{languages}
+ langpackdownloadname Apache_OpenOffice_{productversion}_languagepack_{os}_install_{languages}
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ }
}
URE
@@ -255,7 +245,7 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 3.5
+ PRODUCTVERSION 3.5.0
PACKAGEVERSION 3.5
PACKAGEREVISION 1
PRODUCTEXTENSION
@@ -273,13 +263,14 @@ URE
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
NOLANGUAGESELECTIONPRODUCT 1
- STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
- STARTCENTER_INFO_URL http://www.openoffice.org
- STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice-URE
+ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
- PACKAGEMAP package_names_ext.txt
- DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+ PACKAGEMAP package_names_ext.txt
+ DICT_REPO_URL http://extensions.openoffice.org/dictionaries
}
active 1
compression 5
@@ -288,15 +279,15 @@ URE
}
}
-OpenOffice_SDK
+Apache_OpenOffice_SDK
{
Settings
{
downloadname Apache_OpenOffice-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.5
+ PRODUCTNAME Apache OpenOffice
+ PRODUCTVERSION 3.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -321,11 +312,12 @@ OpenOffice_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
- STARTCENTER_INFO_URL http://www.openoffice.org
- STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice-SDK
+ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+ DICT_REPO_URL http://extensions.openoffice.org/dictionaries
}
active 1
compression 5
@@ -334,15 +326,15 @@ OpenOffice_SDK
}
}
-OpenOffice_Dev_SDK
+Apache_OpenOffice_Dev_SDK
{
Settings
{
downloadname Apache_OpenOffice-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
- PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.5
+ PRODUCTNAME AOO-Developer-Build
+ PRODUCTVERSION 3.5.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -353,11 +345,11 @@ OpenOffice_Dev_SDK
BRANDPACKAGEVERSION 3
PACKAGEVERSION 3.5.0
PACKAGEREVISION {milestone}
- BASISPACKAGEPREFIX ooobasis-dev
- UREPACKAGEPREFIX ooodev
- SOLSUREPACKAGEPREFIX ooodev
+ BASISPACKAGEPREFIX aoobasis-dev
+ UREPACKAGEPREFIX aoodev
+ SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
- DEVELOPMENTPRODUCT 1
+ DEVELOPMENTPRODUCT 1
PACK_INSTALLED 1
POOLPRODUCT 0
DMG_VOLUMEEXTENSION SDK
@@ -374,11 +366,12 @@ OpenOffice_Dev_SDK
DOWNLOADSETUPICO ooosetup.ico
DONTUSESTARTMENUFOLDER 1
RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
- STARTCENTER_INFO_URL http://www.openoffice.org
- STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
+ AOODOWNLOADNAMEPREFIX Apache_OpenOffice-Dev-SDK
+ STARTCENTER_ADDFEATURE_URL http://extensions.openoffice.org/
+ STARTCENTER_INFO_URL http://www.openoffice.org
+ STARTCENTER_TEMPLREP_URL http://templates.openoffice.org
STARTCENTER_LAYOUT_STYLE 0
- DICT_REPO_URL http://extensions.openoffice.org/dictionaries
+ DICT_REPO_URL http://extensions.openoffice.org/dictionaries
}
active 1
compression 5
Modified: openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java (original)
+++ openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java Fri Feb 1 08:46:00 2013
@@ -101,8 +101,6 @@ public class InterfaceContainer implemen
/**
* The size of the ArrayList (the number of elements it contains).
- *
- * @serial
*/
private int size;
Modified: openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java (original)
+++ openoffice/branches/ia2/main/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java Fri Feb 1 08:46:00 2013
@@ -79,6 +79,7 @@ public class WeakAdapter implements XAda
{
return m_weakRef.get();
}
+
/** Method of com.sun.star.uno.XAdapter. Called by clients to register listener which
* are notified when the weak object is dying.
*@param xReference a listener
@@ -87,8 +88,9 @@ public class WeakAdapter implements XAda
{
m_xreferenceList.remove(xReference);
}
+
/** Method of com.sun.star.uno.XAdapter. Called by clients to unregister listeners.
- *@param a listener
+ *@param xReference listener
*/
public void addReference(XReference xReference)
{
Modified: openoffice/branches/ia2/main/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java (original)
+++ openoffice/branches/ia2/main/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java Fri Feb 1 08:46:00 2013
@@ -42,7 +42,7 @@ import com.sun.star.comp.loader.FactoryH
* @see com.sun.star.bridge.XBridge
* @see com.sun.star.bridge.XBridgeFactory
* @see com.sun.star.bridge.XInstanceProvider
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
* @since UDK1.0
*/
public class ConstantInstanceProvider implements XInstanceProvider {
Modified: openoffice/branches/ia2/main/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java (original)
+++ openoffice/branches/ia2/main/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java Fri Feb 1 08:46:00 2013
@@ -38,7 +38,7 @@ import com.sun.star.lang.DisposedExcepti
* @author Kay Ramme
* @see com.sun.star.lib.uno.environments.remote.ThreadPool
* @see com.sun.star.lib.uno.environments.remote.Job
- * @see com.sun.star.lib.uno.environments.remote.ThreadID
+ * @see com.sun.star.lib.uno.environments.remote.ThreadId
* @since UDK1.0
*/
public class JobQueue {
Modified: openoffice/branches/ia2/main/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java (original)
+++ openoffice/branches/ia2/main/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java Fri Feb 1 08:46:00 2013
@@ -259,7 +259,7 @@ public class ThreadPool_Test extends Com
protected abstract void runTest() throws InterruptedException;
private final int count;
- };
+ }
Stress stress1 = new Stress(50) {
protected void runTest() throws InterruptedException {
Modified: openoffice/branches/ia2/main/l10ntools/scripts/tool/const.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/l10ntools/scripts/tool/const.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/l10ntools/scripts/tool/const.py (original)
+++ openoffice/branches/ia2/main/l10ntools/scripts/tool/const.py Fri Feb 1 08:46:00 2013
@@ -23,8 +23,8 @@
class _const:
class ConstError(TypeError): pass
def __setattr__(self, name, value):
- if self.__dict__.has_key(name):
- raise self.ConstError, "Can't rebind const(%s)"%name
+ if name in self.__dict__:
+ raise self.ConstError("Can't rebind const(%s)"%name)
self.__dict__[name] = value
import sys
Modified: openoffice/branches/ia2/main/l10ntools/scripts/tool/l10ntool.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/l10ntools/scripts/tool/l10ntool.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/l10ntools/scripts/tool/l10ntool.py (original)
+++ openoffice/branches/ia2/main/l10ntools/scripts/tool/l10ntool.py Fri Feb 1 08:46:00 2013
@@ -123,7 +123,7 @@ class AbstractL10nTool:
try:
shutil.copy(inputfilename, outputfilename)
except IOError:
- print "ERROR: Can not copy file '" + inputfilename + "' to " + "'" + outputfilename + "'"
+ print("ERROR: Can not copy file '" + inputfilename + "' to " + "'" + outputfilename + "'")
sys.exit(-1)
def extract(self):
@@ -131,7 +131,7 @@ class AbstractL10nTool:
f = open(self._options.outputfile, "w+")
f.write(self.extract_file(self._options.inputfile))
except IOError:
- print "ERROR: Can not write file " + self._options.outputfile
+ print("ERROR: Can not write file " + self._options.outputfile)
else:
f.close()
@@ -173,7 +173,7 @@ class AbstractL10nTool:
dir = filename[:filename.rfind('/')]
if os.path.exists(dir):
if os.path.isfile(dir):
- print "ERROR: There is a file '"+dir+"' where I want create a directory"
+ print("ERROR: There is a file '"+dir+"' where I want create a directory")
sys.exit(-1)
else:
return
@@ -181,7 +181,7 @@ class AbstractL10nTool:
try:
os.makedirs(dir)
except IOError:
- print "Error: Can not create dir " + dir
+ print("Error: Can not create dir " + dir)
sys.exit(-1)
def test_options(self):
@@ -191,7 +191,7 @@ class AbstractL10nTool:
( is_valid(opt.inputfile) and (( is_valid(opt.path_prefix) and is_valid(opt.path_postfix) ) or is_valid(opt.outputfile)) and \
( ( is_valid(opt.input_sdf_file) and ( is_valid(opt.outputfile) or ( is_valid(opt.path_prefix) and is_valid(opt.path_postfix) ) or \
( is_valid(opt.inputfile) and is_valid(opt.outputFile)) ))))
- print "Strange options ..."
+ print("Strange options ...")
sys.exit( -1 )
def read_inputfile_list(self):
@@ -201,7 +201,7 @@ class AbstractL10nTool:
f = open(self._options.inputfile[1:], "r")
lines = [line.strip('\n') for line in f.readlines()]
except IOError:
- print "ERROR: Can not read file list " + self._options.inputfile[2:]
+ print("ERROR: Can not read file list " + self._options.inputfile[2:])
sys.exit(-1)
else:
f.close()
Modified: openoffice/branches/ia2/main/l10ntools/scripts/tool/pseudo.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/l10ntools/scripts/tool/pseudo.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/l10ntools/scripts/tool/pseudo.py (original)
+++ openoffice/branches/ia2/main/l10ntools/scripts/tool/pseudo.py Fri Feb 1 08:46:00 2013
@@ -38,7 +38,7 @@ class PseudoSet:
tmplist.extend(other)
return PseudoSet(self._remove_dupes(tmplist))
else:
- print "__or__(None)"
+ print("__or__(None)")
def __sub__(self,other):
tmplist = []
@@ -46,7 +46,7 @@ class PseudoSet:
tmplist.extend(self._list)
[tmplist.remove(key) for key in other if key in tmplist]
else:
- print "__sub__(none)"
+ print("__sub__(none)")
return PseudoSet(tmplist)
def __and__(self, other):
@@ -55,13 +55,13 @@ class PseudoSet:
[tmplist.append(key) for key in self._list if key in other]
return PseudoSet(tmplist)
else:
- print "__and__(None)"
+ print("__and__(None)")
def __iter__(self):
return self._list.__iter__()
def __items__(self):
- return self._list.items()
+ return list(self._list.items())
def __keys__(self):
return keys(self._list)
@@ -70,7 +70,7 @@ class PseudoSet:
tmpdict = {}
for key in list:
tmpdict[key] = 1
- return tmpdict.keys()
+ return list(tmpdict.keys())
# incomplete OrderedDict() class implementation
class PseudoOrderedDict(dict):
@@ -79,7 +79,7 @@ class PseudoOrderedDict(dict):
def __init__(self, defaults={}):
dict.__init__(self)
- for n,v in defaults.items():
+ for n,v in list(defaults.items()):
self[n] = v
def __setitem__(self, key, value):
@@ -105,10 +105,10 @@ class PseudoOrderedDict(dict):
def iteritems(self):
#return self._valuelist
- return zip(self._keylist, self._valuelist)
+ return list(zip(self._keylist, self._valuelist))
def items(self):
- return zip(self._keylist,self._valuelist)
+ return list(zip(self._keylist,self._valuelist))
def __keys__(self):
return self._keylist
@@ -140,23 +140,23 @@ def _testdriver_set():
list1.append("e")
if "a" in list:
- print "YEAH!"
+ print("YEAH!")
a = PseudoSet(list)
b = PseudoSet(list1)
- print "a="+str(a)
- print "b="+str(b)
- print "a|b=" + str(a|b)
- print "a="+str(a)
- print "b="+str(b)
- print "a&b=" + str(a&b)
- print "a="+str(a)
- print "b="+str(b)
- print "a-b" + str(a-b)
+ print("a="+str(a))
+ print("b="+str(b))
+ print("a|b=" + str(a|b))
+ print("a="+str(a))
+ print("b="+str(b))
+ print("a&b=" + str(a&b))
+ print("a="+str(a))
+ print("b="+str(b))
+ print("a-b" + str(a-b))
for key in a:
- print key
+ print(key)
def _testdriver_dict():
d = PseudoOrderedDict()
@@ -167,12 +167,12 @@ def _testdriver_dict():
d["e"] = 5
d["f"] = 6
- print "a="+str(d["a"])
- print "e="+str(d["e"])
- for key,value in d.iteritems():
- print "d["+key+"]="+str(d[key])
- print "key="+str(key)+" value="+str(value)
+ print("a="+str(d["a"]))
+ print("e="+str(d["e"]))
+ for key,value in d.items():
+ print("d["+key+"]="+str(d[key]))
+ print("key="+str(key)+" value="+str(value))
- print "keys="+str(d.keys())
+ print("keys="+str(list(d.keys())))
#_testdriver_dict()
Modified: openoffice/branches/ia2/main/l10ntools/scripts/tool/sdf.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/l10ntools/scripts/tool/sdf.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/l10ntools/scripts/tool/sdf.py (original)
+++ openoffice/branches/ia2/main/l10ntools/scripts/tool/sdf.py Fri Feb 1 08:46:00 2013
@@ -31,13 +31,13 @@ class SdfData:
self._filename = filename
def __getitem__(self, key):
- if self._dict.has_key(key):
+ if key in self._dict:
return self._dict[key]
else:
return None
def has_key(self, key):
- return self._dict.has_key(key)
+ return key in self._dict
def __setitem__(self, key, value):
self._dict[key] = value
@@ -50,7 +50,7 @@ class SdfData:
f = open(self._filename, "r")
lines = [line.rstrip('\n') for line in f.readlines()]
except IOError:
- print "ERROR: Trying to read "+ self._filename
+ print("ERROR: Trying to read "+ self._filename)
raise
else:
f.close()
@@ -63,11 +63,11 @@ class SdfData:
def write(self, filename):
try:
f = open(filename, "w+")
- for value in self._dict.itervalues():
+ for value in self._dict.values():
#f.write( repr(value)+"\n" )
f.write(value + "\n")
except IOError:
- print "ERROR: Trying to write " + filename
+ print("ERROR: Trying to write " + filename)
raise
else:
f.close()
Modified: openoffice/branches/ia2/main/l10ntools/scripts/tool/xtxex.py
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/l10ntools/scripts/tool/xtxex.py?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/l10ntools/scripts/tool/xtxex.py (original)
+++ openoffice/branches/ia2/main/l10ntools/scripts/tool/xtxex.py Fri Feb 1 08:46:00 2013
@@ -39,14 +39,14 @@ class Xtxex(AbstractL10nTool):
return
# merge usual lang
sdfline = self.prepare_sdf_line(inputfilename,lang)
- if sdfdata.has_key(sdfline.get_id()):
+ if sdfline.get_id() in sdfdata:
line = sdfdata[sdfline.get_id()].text.replace("\\n", '\n')
self.make_dirs(outputfilename)
try:
f = open(outputfilename, "w+")
f.write(line)
except IOError:
- print "ERROR: Can not write file " + outputfilename
+ print("ERROR: Can not write file " + outputfilename)
sys.exit(-1)
else:
f.close()
@@ -62,7 +62,7 @@ class Xtxex(AbstractL10nTool):
f = open(inputfile, "r")
lines = f.readlines()
except IOError:
- print "ERROR: Can not open file " + inputfile
+ print("ERROR: Can not open file " + inputfile)
sys.exit(-1)
else:
f.close()
Modified: openoffice/branches/ia2/main/l10ntools/source/help/HelpIndexerTool.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/l10ntools/source/help/HelpIndexerTool.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/l10ntools/source/help/HelpIndexerTool.java (original)
+++ openoffice/branches/ia2/main/l10ntools/source/help/HelpIndexerTool.java Fri Feb 1 08:46:00 2013
@@ -43,6 +43,15 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Date;
+/**
+ When this tool is used with long path names on Windows, that is paths which start
+ with \\?\, then the caller must make sure that the path is unique. This is achieved
+ by removing '.' and '..' from the path. Paths which are created by
+ osl_getSystemPathFromFileURL fulfill this requirement. This is necessary because
+ lucene is patched to not use File.getCanonicalPath. See long_path.patch in the lucene
+ module.
+ */
+
public class HelpIndexerTool
{
public HelpIndexerTool()
@@ -176,7 +185,7 @@ public class HelpIndexerTool
{
Date start = new Date();
Analyzer analyzer = aLanguageStr.equals("ja") ? (Analyzer)new CJKAnalyzer(Version.LUCENE_29) : (Analyzer)new StandardAnalyzer(Version.LUCENE_29);
- IndexWriter writer = new IndexWriter( NIOFSDirectory.open(aIndexDir), analyzer, true, IndexWriter.MaxFieldLength.LIMITED );
+ IndexWriter writer = new IndexWriter( NIOFSDirectory.open(aIndexDir), analyzer, true, IndexWriter.MaxFieldLength.UNLIMITED );
if( !bExtensionMode )
System.out.println( "Lucene: Indexing to directory '" + aIndexDir + "'..." );
int nRet = indexDocs( writer, aModule, bExtensionMode, aCaptionFilesDir, aContentFilesDir );
Modified: openoffice/branches/ia2/main/libxml2/libxml2-configure.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/libxml2/libxml2-configure.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/libxml2/libxml2-configure.patch (original)
+++ openoffice/branches/ia2/main/libxml2/libxml2-configure.patch Fri Feb 1 08:46:00 2013
@@ -1,6 +1,6 @@
---- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
-+++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
-@@ -6271,8 +6271,8 @@
+--- misc/libxml2-2.7.8/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
++++ misc/build/libxml2-2.7.8/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
+@@ -6599,8 +6599,8 @@
;;
freebsd-elf)
@@ -11,8 +11,8 @@
;;
irix | nonstopux)
---- misc/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000
-+++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000
+--- misc/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000
++++ misc/build/libxml2-2.7.8/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000
@@ -264,7 +264,7 @@
*
* Whether iconv support is available
@@ -22,7 +22,7 @@
#define LIBXML_ICONV_ENABLED
#endif
-@@ -282,7 +282,7 @@
+@@ -291,7 +291,7 @@
*
* Whether Debugging module is configured in
*/
@@ -31,7 +31,7 @@
#define LIBXML_DEBUG_ENABLED
#endif
-@@ -291,7 +291,7 @@
+@@ -300,7 +300,7 @@
*
* Whether the memory debugging is configured in
*/
@@ -40,7 +40,7 @@
#define DEBUG_MEMORY_LOCATION
#endif
-@@ -300,7 +300,7 @@
+@@ -309,7 +309,7 @@
*
* Whether the runtime debugging is configured in
*/
@@ -49,8 +49,8 @@
#define LIBXML_DEBUG_RUNTIME
#endif
---- misc/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:20.000000000 +0000
-+++ misc/build/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:36.000000000 +0000
+--- misc/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:20.000000000 +0000
++++ misc/build/libxml2-2.7.8/xml2-config.in 2009-12-17 11:45:36.000000000 +0000
@@ -1,9 +1,14 @@
#! /bin/sh
Modified: openoffice/branches/ia2/main/libxml2/libxml2-global-symbols.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/libxml2/libxml2-global-symbols.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/libxml2/libxml2-global-symbols.patch (original)
+++ openoffice/branches/ia2/main/libxml2/libxml2-global-symbols.patch Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/libxml2.syms Tue Oct 6 18:31:35 2009
-+++ misc/build/libxml2-2.7.6/libxml2.syms Wed Jul 7 15:43:17 2010
+--- misc/libxml2-2.7.8/libxml2.syms Tue Oct 6 18:31:35 2009
++++ misc/build/libxml2-2.7.8/libxml2.syms Wed Jul 7 15:43:17 2010
@@ -2184,10 +2184,10 @@
} LIBXML2_2.6.27;
Modified: openoffice/branches/ia2/main/libxml2/libxml2-long-path.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/libxml2/libxml2-long-path.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/libxml2/libxml2-long-path.patch (original)
+++ openoffice/branches/ia2/main/libxml2/libxml2-long-path.patch Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/uri.c 2009-10-02 17:28:55.000000000 +0200
-+++ misc/build/libxml2-2.7.6/uri.c 2011-02-24 13:47:19.349299000 +0100
+--- misc/libxml2-2.7.8/uri.c 2009-10-02 17:28:55.000000000 +0200
++++ misc/build/libxml2-2.7.8/uri.c 2011-02-24 13:47:19.349299000 +0100
@@ -2479,7 +2479,16 @@
if (path == NULL)
return(NULL);
@@ -18,8 +18,8 @@
if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/'))
path++;
---- misc/libxml2-2.7.6/xmlIO.c 2009-09-24 17:32:00.000000000 +0200
-+++ misc/build/libxml2-2.7.6/xmlIO.c 2011-02-24 13:47:26.163762000 +0100
+--- misc/libxml2-2.7.8/xmlIO.c 2009-09-24 17:32:00.000000000 +0200
++++ misc/build/libxml2-2.7.8/xmlIO.c 2011-02-24 13:47:26.163762000 +0100
@@ -772,6 +772,11 @@
#ifdef HAVE_STAT
@@ -32,3 +32,18 @@
if (xmlWrapStat(path, &stat_buffer) == -1)
return 0;
#else
+--- misc/libxml2-2.7.8/win32/Makefile.msvc 2010-11-04 09:58:43.000000000 -0500
++++ misc/build/libxml2-2.7.8/win32/Makefile.msvc 2012-12-21 01:07:45.000000000 -0500
+@@ -71,9 +71,9 @@
+ !if "$(WITH_ICONV)" == "1"
+ LIBS = $(LIBS) iconv.lib
+ !endif
+-+!if "$(WITH_ICU)" == "1"
+-+LIBS = $(LIBS) icu.lib
+-+!endif
++!if "$(WITH_ICU)" == "1"
++LIBS = $(LIBS) icu.lib
++!endif
+ !if "$(WITH_ZLIB)" == "1"
+ LIBS = $(LIBS) zdll.lib
+ !endif
Modified: openoffice/branches/ia2/main/libxml2/libxml2-mingw.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/libxml2/libxml2-mingw.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/libxml2/libxml2-mingw.patch (original)
+++ openoffice/branches/ia2/main/libxml2/libxml2-mingw.patch Fri Feb 1 08:46:00 2013
@@ -1,6 +1,6 @@
---- misc/libxml2-2.7.6/configure 2008-01-11 17:01:56.000000000 +0900
-+++ misc/build/libxml2-2.7.6/configure 2009-09-07 20:48:47.656250000 +0900
-@@ -19914,6 +19914,8 @@
+--- misc/libxml2-2.7.8/configure 2008-01-11 17:01:56.000000000 +0900
++++ misc/build/libxml2-2.7.8/configure 2009-09-07 20:48:47.656250000 +0900
+@@ -13566,6 +13566,8 @@
if test "$with_modules" != "no" ; then
case "$host" in
@@ -8,8 +8,8 @@
+ ;;
*-*-cygwin*)
MODULE_EXTENSION=".dll"
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
-@@ -20632,11 +20636,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lcygwin" >&5
+@@ -13868,11 +13868,10 @@
fi
case $host_os in
@@ -22,8 +22,8 @@
;;
*cygwin*) THREAD_LIBS=""
;;
---- misc/libxml2-2.7.6/libxml.h 2007-11-23 19:47:23.000000000 +0900
-+++ misc/build/libxml2-2.7.6/libxml.h 2009-07-10 14:37:34.988250000 +0900
+--- misc/libxml2-2.7.8/libxml.h 2007-11-23 19:47:23.000000000 +0900
++++ misc/build/libxml2-2.7.8/libxml.h 2009-07-10 14:37:34.988250000 +0900
@@ -30,6 +30,10 @@
#include <libxml/xmlversion.h>
#else
@@ -34,15 +34,4 @@
+#endif
#include <libxml/xmlversion.h>
#endif
-
---- misc/libxml2-2.7.6/include/libxml/xmlexports.h 2009-09-25 00:31:59.000000000 +0900
-+++ misc/build/libxml2-2.7.6/include/libxml/xmlexports.h 2010-06-06 11:15:54.160750000 +0900
-@@ -113,7 +113,7 @@
- * _imp__xmlFree listed as missing. Try to workaround the problem
- * by also making that declaration when compiling client code.
- */
-- #if !defined(LIBXML_STATIC)
-+ #if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
- #define XMLPUBFUN __declspec(dllexport)
- #define XMLPUBVAR __declspec(dllexport)
- #else
+
\ No newline at end of file
Modified: openoffice/branches/ia2/main/libxml2/libxml2-runtest.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/libxml2/libxml2-runtest.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/libxml2/libxml2-runtest.patch (original)
+++ openoffice/branches/ia2/main/libxml2/libxml2-runtest.patch Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/runtest.c 2009-09-24 23:32:00.000000000 +0800
-+++ misc/build/libxml2-2.7.6/runtest.c 2012-05-29 14:17:16.852600200 +0800
+--- misc/libxml2-2.7.8/runtest.c 2009-09-24 23:32:00.000000000 +0800
++++ misc/build/libxml2-2.7.8/runtest.c 2012-05-29 14:17:16.852600200 +0800
@@ -2728,7 +2728,7 @@
"file:///path/to/a%20b.html",
"/path/to/a b.html",
Modified: openoffice/branches/ia2/main/libxml2/libxml2-testapi.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/libxml2/libxml2-testapi.patch?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/libxml2/libxml2-testapi.patch (original)
+++ openoffice/branches/ia2/main/libxml2/libxml2-testapi.patch Fri Feb 1 08:46:00 2013
@@ -1,5 +1,5 @@
---- misc/libxml2-2.7.6/testapi.c 2009-09-24 23:32:00.000000000 +0800
-+++ misc/build/libxml2-2.7.6/testapi.c 2012-05-29 14:17:00.868020600 +0800
+--- misc/libxml2-2.7.8/testapi.c 2009-09-24 23:32:00.000000000 +0800
++++ misc/build/libxml2-2.7.8/testapi.c 2012-05-29 14:17:00.868020600 +0800
@@ -291,7 +291,7 @@
static xmlChar gen_xmlChar(int no, int nr ATTRIBUTE_UNUSED) {
if (no == 0) return('a');
Modified: openoffice/branches/ia2/main/libxml2/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/libxml2/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/libxml2/makefile.mk (original)
+++ openoffice/branches/ia2/main/libxml2/makefile.mk Fri Feb 1 08:46:00 2013
@@ -38,16 +38,15 @@ all:
# --- Files --------------------------------------------------------
-LIBXML2VERSION=2.7.6
+LIBXML2VERSION=2.7.8
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
-TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2
+TARFILE_MD5=8127a65e8c3b08856093099b52599c86
# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols
PATCH_FILES=libxml2-configure.patch \
libxml2-mingw.patch \
- libxml2-gnome599717.patch \
- libxml2-xpath.patch \
+ libxml2-fixes.patch \
libxml2-global-symbols.patch \
libxml2-testapi.patch \
libxml2-runtest.patch
Modified: openoffice/branches/ia2/main/lucene/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/lucene/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/lucene/makefile.mk (original)
+++ openoffice/branches/ia2/main/lucene/makefile.mk Fri Feb 1 08:46:00 2013
@@ -31,9 +31,17 @@ TARGET=so_lucene
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-# --- Files --------------------------------------------------------
.IF "$(SOLAR_JAVA)" != ""
+.IF "$(SYSTEM_LUCENE)" == "YES"
+
+all:
+ @echo "An already available installation of Apache Lucene should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+
+.ENDIF
+
+# --- Files --------------------------------------------------------
LUCENE_MAJOR=2
LUCENE_MINOR=9
@@ -50,12 +58,19 @@ TARFILE_ROOTDIR=$(LUCENE_NAME)
PATCH_FILES=lucene.patch
+.IF "$(OS)" == "WNT"
+PATCH_FILES+= long_path.patch
+.ENDIF
+
BUILD_DIR=.
BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers/common$/$(LUCENE_ANALYZERS_JAR)
-.ENDIF
+.ELSE # $(SOLAR_JAVA)!= ""
+nojava:
+ @echo "Not building $(PRJNAME) because Java is disabled"
+.ENDIF # $(SOLAR_JAVA)!= ""
# --- Targets ------------------------------------------------------
Modified: openoffice/branches/ia2/main/odk/cfgWin.js
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/cfgWin.js?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/cfgWin.js (original)
+++ openoffice/branches/ia2/main/odk/cfgWin.js Fri Feb 1 08:46:00 2013
@@ -22,8 +22,8 @@
// examples of the Office Development Kit. The script duplicates the template
// script and inserts the variables into the copied script.
// The Script was developed for the operating systems Microsoft Windows.
-var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
-var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\OpenOffice.org\\UNO\\InstallPath\\";
+var regKeyOfficeCurrentUser = "HKEY_CURRENT_USER\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
+var regKeyOfficeLocaleMachine = "HKEY_LOCAL_MACHINE\\Software\\Apache OpenOffice\\UNO\\InstallPath\\";
var regKeyDotNetInstallRoot = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\.NETFramework\\InstallRoot";
var regKeyDotNet1_1 = "HKLM\\Software\\Microsoft\\.NETFramework\\policy\\v1.1\\4322";
var sDirDotNet1_1 = "v1.1.4322";
@@ -923,18 +923,18 @@ function writeBatFile(fdir, file)
"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\\OpenOffice.org\\Basic 3.0\\sdk\n" +
+ "REM Example: set OO_SDK_HOME=C:\\Program Files\\Apache OpenOffice\\Basic 3.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\\OpenOffice.org 3\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice 3\n" +
"set OFFICE_HOME=" + office_home +
"\n\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\OpenOffice.org\\Basis 3.0\n" +
+ "REM Example: set OFFICE_HOME=C:\\Program Files\\Apache OpenOffice\\Basis 3.0\n" +
"set OFFICE_BASE_HOME=" + office_base_home +
"\n\n" +
"REM URE installation directory.\n" +
- "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\OpenOffice.org\\URE\n" +
+ "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\Apache OpenOffice\\URE\n" +
"set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
"\n\n" +
"REM Directory of the make command.\n" +
Modified: openoffice/branches/ia2/main/odk/configure.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/configure.pl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/configure.pl (original)
+++ openoffice/branches/ia2/main/odk/configure.pl Fri Feb 1 08:46:00 2013
@@ -235,7 +235,7 @@ if ( $main::OFFICE_OR_URE eq "Office" )
else
{
# prepare URE path
- $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/openoffice.org/ure";
+ $main::OO_SDK_URE_HOME_SUGGESTION = "/opt/apacheopenoffice/ure";
$main::OO_SDK_URE_HOME_SUGGESTION = "" unless
-e "$main::OO_SDK_URE_HOME_SUGGESTION/bin/uno";
for (;;)
@@ -711,6 +711,9 @@ sub searchprog
sub searchMacOffice
{
+ if (-d "/Applications/Apache OpenOffice.app" ) {
+ return "/Applications/Apache OpenOffice.app"
+ }
if (-d "/Applications/OpenOffice.org.app" ) {
return "/Applications/OpenOffice.org.app"
}
@@ -729,9 +732,9 @@ sub searchMacOffice
sub searchoffice
{
- my $offset = rindex($main::sdkpath, "/openoffice.org");
+ my $offset = rindex($main::sdkpath, "/apacheopenoffice");
my $tmpOffice = substr($main::sdkpath, 0, $offset);
- my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION";
+ my $officepath = "$tmpOffice/apacheopenoffice$main::OO_MAJORVERSION";
# if ( $main::OO_MINORVERSION > 0) {
# $officepath = "$officepath$main::OO_MINORVERSION";
Modified: openoffice/branches/ia2/main/odk/docs/install.html
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/docs/install.html?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/docs/install.html (original)
+++ openoffice/branches/ia2/main/odk/docs/install.html Fri Feb 1 08:46:00 2013
@@ -188,7 +188,7 @@
<tr valign="top">
<td class="cell20"><b>OFFICE_HOME</b></td>
<td class="cell80">Path to an existing Apache OpenOffice
- base installation, e.g. "/opt/openoffice.org3". Be sure
+ base installation, e.g. "/opt/apacheopenoffice3". Be sure
that it is not a user installation only. Exactly one of OFFICE_HOME
and OO_SDK_URE_HOME must be set. The other should be either unset or
set to an empty value.</td>
@@ -205,7 +205,7 @@
<tr>
<td class="cell20"><b>OO_SDK_URE_HOME</b></td>
<td class="cell80">Path to an existing UNO Runtime Environment
- installation, e.g. "/opt/openoffice.org/ure". Exactly one of
+ installation, e.g. "/opt/apacheopenoffice/ure". Exactly one of
OFFICE_HOME and OO_SDK_URE_HOME must be set. The other should be
either unset or set to an empty value.</td>
</tr>
@@ -259,7 +259,7 @@
the output is generated in the SDK directory itself. If an output
directory is specified, the output is generated in a SDK dependent
subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR>
- /OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td>
+ /Apache OpenOffice %PRODUCT_RELEASE%/LINUXExample.out)</td>
</tr>
<tr>
<td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>
Modified: openoffice/branches/ia2/main/odk/docs/notsupported.html
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/docs/notsupported.html?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/docs/notsupported.html (original)
+++ openoffice/branches/ia2/main/odk/docs/notsupported.html Fri Feb 1 08:46:00 2013
@@ -23,7 +23,7 @@
-->
<html>
<head>
- <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Not supported page</title>
+ <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Not supported page</title>
<link rel="stylesheet" type="text/css" href="sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="author" content="Jürgen Schmidt">
Modified: openoffice/branches/ia2/main/odk/docs/tools.html
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/docs/tools.html?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/docs/tools.html (original)
+++ openoffice/branches/ia2/main/odk/docs/tools.html Fri Feb 1 08:46:00 2013
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
#**************************************************************
#
@@ -23,7 +23,7 @@
-->
<html>
<head>
- <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Development Tools</title>
+ <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Development Tools</title>
<link rel="stylesheet" type="text/css" href="sdk_styles.css">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="author" content="Jürgen Schmidt">
@@ -168,7 +168,7 @@
office installation. UNO packages are UNO components (single libraries or
Jar files or more complex zip files that contains one or more libraries|
Jar files, type libraries and configuration items), scripts and
- OpenOffice.org %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the
+ Apache OpenOffice %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the
SDK but comes with the office directly and is a development tool as well
as an end user tool to deploy extension into an office installation.</p>
<p>More details concerning deployment and this tool can be find in the
Modified: openoffice/branches/ia2/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java (original)
+++ openoffice/branches/ia2/main/odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java Fri Feb 1 08:46:00 2013
@@ -45,6 +45,7 @@ import com.sun.star.awt.Point;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.Size;
import com.sun.star.awt.XMessageBoxFactory;
+import com.sun.star.awt.MessageBoxType;
import com.sun.star.awt.XWindow;
// __________ Implementation __________
@@ -194,11 +195,10 @@ public class SelectionChangeListener imp
XWindow xWin = aDesktop.getCurrentFrame().getContainerWindow();
XWindowPeer aWinPeer = (XWindowPeer) UnoRuntime.queryInterface(XWindowPeer.class, xWin);
-
- Rectangle aRect = new Rectangle();
+
int button = com.sun.star.awt.MessageBoxButtons.BUTTONS_OK;
XMessageBoxFactory aMBF = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, aToolKit);
- XMessageBox xMB = aMBF.createMessageBox(aWinPeer, aRect, "infobox" , button, "Event-Notify", "Listener was called, selcetion has changed");
+ XMessageBox xMB = aMBF.createMessageBox(aWinPeer, MessageBoxType.INFOBOX, button, "Event-Notify", "Listener was called, selcetion has changed");
xMB.execute();
}
}