merge with m55

3 files changed, 62 insertions, 0 deletions

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index d819d6045816..99ca8b140d51 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -149,6 +149,8 @@ ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
 
 sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
 
+sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
+
 ure: $(foreach,i,$(alllangiso) ure_$i)
 
 broffice: $(foreach,i,$(alllangiso) broffice_$i)
@@ -195,6 +197,8 @@ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
              
 $(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
 
@@ -274,6 +278,14 @@ sdkoo_% :
     $(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 $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
 
 .IF "$(PKGFORMAT)"!=""
+$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
+sdkoodev_%{$(PKGFORMAT:^".")} :
+.ELSE			# "$(PKGFORMAT)"!=""
+sdkoodev_% :
+.ENDIF			# "$(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 $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH) $(VERBOSESWITCH))
+
+.IF "$(PKGFORMAT)"!=""
 $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
 ure_%{$(PKGFORMAT:^".")} :
 .ELSE			# "$(PKGFORMAT)"!=""
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 7e65e07d3053..76c70ed8a435 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -323,6 +323,55 @@ OpenOffice_SDK
     }
 }
 
+OpenOffice_Dev_SDK
+{
+    Settings
+    {
+        downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
+        variables
+        {
+            PRODUCTNAME OOo-dev
+            PRODUCTVERSION 3.2
+            PRODUCTEXTENSION
+            LONG_PRODUCTEXTENSION
+            SHORT_PRODUCTEXTENSION
+            BASISROOTNAME OOo-dev
+            UNIXBASISROOTNAME ooo-dev
+            POSTVERSIONEXTENSION SDK
+            POSTVERSIONEXTENSIONUNIX sdk
+            BRANDPACKAGEVERSION 3
+            PACKAGEVERSION 3.2.0
+            PACKAGEREVISION {milestone}
+            BASISPACKAGEPREFIX ooobasis-dev
+            UREPACKAGEPREFIX ooodev
+            SOLSUREPACKAGEPREFIX ooodev
+            REGISTRYLAYERNAME LayerDev
+            PACK_INSTALLED 1
+            POOLPRODUCT 0
+            DMG_VOLUMEEXTENSION SDK
+            DATABASENAME openofficeorg32devsdk
+            NO_README_IN_ROOTDIR 1
+            LICENSENAME LGPL
+            IGNOREDIRECTORYLAYER 1
+            NOVERSIONINDIRNAME 0
+            NOSPACEINDIRECTORYNAME 1
+            CHANGETARGETDIR 1
+            DOWNLOADBANNER ooosdkbanner.bmp
+            DOWNLOADBITMAP ooosdkbitmap.bmp
+            DOWNLOADSETUPICO ooosetup.ico
+            DONTUSESTARTMENUFOLDER 1
+            RELATIVE_PATHES_IN_DDF 1
+            STARTCENTER_ADDFEATURE_URL http://extensions.services.openoffice.org/getmore?cid=920794
+            STARTCENTER_INFO_URL http://www.openoffice.org
+            STARTCENTER_TEMPLREP_URL http://extensions.services.openoffice.org/templates?cid=926383
+        }
+        active 1
+        compression 5
+        script sdkoo
+        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
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 2e62a4938998..875865d8accc 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -15,6 +15,7 @@ OpenOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12
 OpenOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
 #BrOffice_Dev                                                                                      pt-BR   brofficedev
 OpenOffice_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoo
+OpenOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoodev
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
 OpenOfficeLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro        de      ooolanguagepack
 OpenOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12                                     de      ooolanguagepack