[Libreoffice-commits] .: 3 commits - instsetoo_native/prj instsetoo_native/util scp2/inc scp2/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 11 07:24:30 PDT 2010
instsetoo_native/prj/build.lst | 2
instsetoo_native/util/openoffice.lst | 220 -----------------------------------
scp2/inc/macros.inc | 2
scp2/source/ooo/common_brand.scp | 18 ++
4 files changed, 21 insertions(+), 221 deletions(-)
New commits:
commit 9fa09b9b052bb69d2d432efeafa3eb35e6a12bce
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 14:06:18 2010 +0100
push the shell images
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 48a1ae1..3ff244e 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -180,7 +180,7 @@
File id \
TXT_FILE_BODY; \
RESFILE_ALL_LANG(name); \
- Dir = gid_Brand_Dir_Resource; \
+ Dir = gid_Brand_Dir_Program_Resource; \
Styles = (PACKED); \
End
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 9934701..54512d5 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -64,6 +64,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Bin_Unopkg,
gid_Brand_File_Bin_Msvcr71,
gid_Brand_File_Bin_Libxml2,
+ gid_Brand_File_Bmp_Shell,
gid_Brand_File_Bmp_IntroAbout,
gid_Brand_File_C05_Zip_Faq,
gid_Brand_File_C05_Zip_Register,
@@ -119,7 +120,8 @@ Module gid_Module_Langpack_Brand_Template
gid_Brand_Dir_Help_Isolanguage,
gid_Brand_Dir_License,
gid_Brand_Dir_Program,
- gid_Brand_Dir_Resource,
+ gid_Brand_Dir_Program_Shell,
+ gid_Brand_Dir_Program_Resource,
gid_Brand_Dir_Readme,
gid_Brand_Dir_Share,
gid_Brand_Dir_Share_Readme);
@@ -158,11 +160,16 @@ Directory gid_Brand_Dir_Program
#endif
End
-Directory gid_Brand_Dir_Resource
+Directory gid_Brand_Dir_Program_Resource
ParentID = gid_Brand_Dir_Program;
DosName = "resource";
End
+Directory gid_Brand_Dir_Program_Shell
+ ParentID = gid_Brand_Dir_Program;
+ DosName = "shell";
+End
+
Directory gid_Brand_Dir_Readme
#if defined MACOSX
ParentID = gid_Brand_Dir_BasisLink;
@@ -655,6 +662,13 @@ File gid_Brand_File_Images_Brand_Zip
Styles = (PACKED);
End
+File gid_Brand_File_Bmp_Shell
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Program_Shell;
+ Name = "shell.zip";
+ Styles = (ARCHIVE);
+End
+
File gid_Brand_File_Txt_Package
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Extensions;
commit b1eb327c5f0f6dabd4eafc7758ea532f46dc1dd7
Author: Michael Meeks <michael.meeks at novell.com>
Date: Sat Oct 9 19:17:30 2010 +0100
remove (now merged) broffice profiles.
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index b6defc6..0aa9562 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -107,7 +107,7 @@ LibreOffice
script setup_osl
downloadname LibO_{productversion}_{os}_install_{languages}
langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{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},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{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},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
}
}
@@ -172,7 +172,7 @@ LibreOffice_wJRE
compression 5
script setup_osljre
downloadname LibO_{productversion}_{os}_installwjre_{languages}
- include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{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},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ include {solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{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},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{solarpath}/pck.{minor}/brand
}
}
@@ -245,7 +245,7 @@ LibreOffice_Dev
script setup_osljre
downloadname LibO-dev_{productversion}_{os}_install_{languages}
langpackdownloadname LibO_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+ include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,,{solarpath}/pck.{minor}/brand_dev
}
}
@@ -387,217 +387,3 @@ LibreOffice_Dev_SDK
include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
}
}
-
-BrOffice
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.3
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
- PROGRESSBARCOLOR
- PROGRESSSIZE
- PROGRESSPOSITION
- PROGRESSFRAMECOLOR
- NATIVEPROGRESS
- UPDATEURL http://update.documentfoundation.org/ProductUpdateService/check.Update
- ODFNOTIFYURL http://odfnotify.documentfoundation.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.3.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- SERVICESPROJEKT 1
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 0
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.3.0
- CODEFILENAME codes_broo.txt
- PATCHCODEFILE bro_patchcodes.txt
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT LibreOffice
- REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osl
- downloadname BrOo_{productversion}_{os}_install_{languages}
- langpackdownloadname BrOo_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
-
-BrOffice_wJRE
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.3
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
- PROGRESSBARCOLOR
- PROGRESSSIZE
- PROGRESSPOSITION
- PROGRESSFRAMECOLOR
- NATIVEPROGRESS
- UPDATEURL http://update.documentfoundation.org/ProductUpdateService/check.Update
- ODFNOTIFYURL http://odfnotify.documentfoundation.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.3.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- SERVICESPROJEKT 1
- WITHJREPRODUCT 1
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- LIBRARYVERSION 9.3.0
- CODEFILENAME codes_broo.txt
- PATCHCODEFILE bro_patchcodes.txt
- JAVAPRODUCT 1
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT LibreOffice
- REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osljre
- downloadname BrOo_{productversion}_{os}_installwjre_{languages}
- include {solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
-
-BrOffice_Dev
-{
- Settings
- {
- variables
- {
- PRODUCTNAME BrOo-dev
- PRODUCTVERSION 3.3
- PRODUCTEXTENSION
- LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION
- BASISROOTNAME LibO-dev
- UNIXBASISROOTNAME lo-dev
- POSTVERSIONEXTENSION
- POSTVERSIONEXTENSIONUNIX
- BRANDPACKAGEVERSION 3
- USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.3.0
- DEVELOPMENTPRODUCT 1
- BASISPACKAGEPREFIX libobasis-dev
- UREPACKAGEPREFIX lodev
- SOLSUREPACKAGEPREFIX lodev
- REGISTRYLAYERNAME LayerDevBroffice
- SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
- UPDATEURL http://update.documentfoundation.org/ProductUpdateService/check.Update
- ODFNOTIFYURL http://odfnotify.documentfoundation.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.3.0
- PACKAGEREVISION {milestone}
- LICENSENAME LGPL
- SERVICESPROJEKT 1
- SETSTATICPATH 1
- GLOBALFILEGID gid_File_Lib_Vcl
- GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
- SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
- OOODOWNLOADNAME 1
- XPDINSTALLER 1
- BETAUPGRADECODE
- STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
- CHANGETARGETDIR 1
- USE_FILEVERSION 1
- JAVAPRODUCT 1
- LIBRARYVERSION 9.3.0
- PATCHCODEFILE brodev_patchcodes.txt
- CODEFILENAME codes_broodev.txt
- DOWNLOADBANNER brobanner.bmp
- DOWNLOADBITMAP brobitmap.bmp
- DOWNLOADSETUPICO ooosetup.ico
- WINDOWSBITMAPDIRECTORY ..\inc_broffice\windows\msi_templates\Binary
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.documentfoundation.org/
- STARTCENTER_INFO_URL http://www.documentfoundation.org/
- STARTCENTER_TEMPLREP_URL http://templates.documentfoundation.org/
- STARTCENTER_LAYOUT_STYLE 0
- REGISTRATION_PRODUCT LibreOffice
- REGISTRATION_CID 926117
- DICT_REPO_URL http://extensions.documentfoundation.org/dictionaries/
- }
- active 1
- compression 5
- script setup_osljre
- downloadname BrOo-dev_{productversion}_{os}_install_{languages}
- langpackdownloadname BrOo_{productversion}_languagepack_{os}_install_{languages}
- include {solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice_dev,{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
- }
-}
commit 81a10ca3c6c511512cf7dfd93d3b2611178ca680
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Oct 8 20:02:49 2010 +0100
ooo_custom_images no longer needs to build
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index 68edddf..a810b19 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon instsetoo_native :: l10n postprocess packimages testautomation ooo_custom_images NULL
+oon instsetoo_native :: l10n postprocess packimages testautomation NULL
oon instsetoo_native usr1 - all oon_mkout NULL
oon instsetoo_native\inc_openoffice\unix nmake - u oon_unix NULL
oon instsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL
More information about the Libreoffice-commits
mailing list