subject:"\[Libreoffice\-commits\] .\: instsetoo

[Libreoffice-commits] .: instsetoo_native/util

2012-03-19 Thread Tor Lillqvist

 instsetoo_native/util/makefile.mk |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 5a6e8707c2753d8f654e7b04c04f4609ffab52fc
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Mar 19 12:29:44 2012 +0200

Don't build helppack installers if --without-help

Or should it be --without-helppack-integration that affects it? Or
both? Why do we need both these switches?  And what does that
irritating integration thing mean again? Does
--without-helppack-integration mean yes, do build helppacks, but
don't integrate them?

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 04acba4..71e9184 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -74,6 +74,14 @@ LOCALPYFILES= \
 $(BIN)$/pythonloader.py
 .ENDIF
 
+.IF $(BUILD_TYPE)==$(BUILD_TYPE:s/HELP//)
+OOOHELPPACK=
+OOODEVHELPPACK=
+.ELSE
+OOOHELPPACK=ooohelppack
+OOODEVHELPPACK=ooodevhelppack
+.ENDIF
+
 help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name helpcontent2 
2/dev/null | sed -e s|/helpcontent2|| -e s|^.*/|| ) en-US qtz
 
 # do not build key is pseudolanguage for release builds
@@ -93,29 +101,29 @@ ALLTAR  : $(LOCALPYFILES)
 .IF $(ENABLE_RELEASE_BUILD)==TRUE
 .IF $(BUILD_TYPE)==$(BUILD_TYPE:s/ODK//)
 .IF $(GUI)==WNT
-ALLTAR : openofficeall ooohelppack
+ALLTAR : openofficeall $(OOOHELPPACK)
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
 .ENDIF
 .ELSE
 .IF $(GUI)==WNT
-ALLTAR : openofficeall ooohelppack sdkooall
+ALLTAR : openofficeall $(OOOHELPPACK) sdkooall
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
 .ENDIF
 .ENDIF
 .ELSE # $(ENABLE_RELEASE_BUILD)==TRUE
 .IF $(BUILD_TYPE)==$(BUILD_TYPE:s/ODK//)
 .IF $(GUI)==WNT
-ALLTAR : openofficedevall ooodevhelppack
+ALLTAR : openofficedevall $(OOODEVHELPPACK)
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
 .ENDIF
 .ELSE
 .IF $(GUI)==WNT
-ALLTAR : openofficedevall ooodevhelppack sdkoodevall
+ALLTAR : openofficedevall $(OOODEVHELPPACK) sdkoodevall
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) 
sdkoodev_en-US
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) 
sdkoodev_en-US
 .ENDIF
 .ENDIF
 .ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/util

2012-03-06 Thread Andras Timar

 instsetoo_native/util/openoffice.lst |4 
 1 file changed, 4 deletions(-)

New commits:
commit d4b824868f938e40fc2af72990567667cbccbf5c
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 6 21:10:15 2012 +0100

remove unused SETSTATICPATH variable

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 4dcde68..188141e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -74,7 +74,6 @@ LibreOffice
 GLOBALFILEGID gid_File_Lib_Vcl
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-SETSTATICPATH 1
 OOODOWNLOADNAME 1
 XPDINSTALLER 0
 BETAUPGRADECODE
@@ -137,7 +136,6 @@ LibreOffice_Dev
 GLOBALFILEGID gid_File_Lib_Vcl
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-SETSTATICPATH 1
 OOODOWNLOADNAME 1
 XPDINSTALLER 0
 BETAUPGRADECODE
@@ -181,7 +179,6 @@ URE
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION alpha0
 LICENSENAME LGPL
-SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
 PCPFILENAME ure.pcp
 GLOBALFILEGID gid_File_Dl_Cppu
@@ -415,7 +412,6 @@ OxygenOffice
 GLOBALFILEGID gid_File_Lib_Vcl
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-SETSTATICPATH 1
 OOODOWNLOADNAME 1
 XPDINSTALLER 0
 BETAUPGRADECODE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/util solenv/bin

2012-03-06 Thread Andras Timar

 instsetoo_native/util/openoffice.lst  |8 --
 solenv/bin/modules/installer/windows/msiglobal.pm |   29 +-
 2 files changed, 13 insertions(+), 24 deletions(-)

New commits:
commit 07cf4a4a21b4f8f9325e7a7243fba6295ec42a54
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 6 21:17:00 2012 +0100

we always use relative paths in ddf files

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 188141e..6856a67 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -82,7 +82,6 @@ LibreOffice
 USE_FILEVERSION 1
 LIBRARYVERSION 9.4.0
 PATCHCODEFILE ooo_patchcodes.txt
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -146,7 +145,6 @@ LibreOffice_Dev
 PATCHCODEFILE ooodev_patchcodes.txt
 CODEFILENAME codes_ooodev.txt
 LOCALUSERDIR $ORIGIN/..
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -183,7 +181,6 @@ URE
 PCPFILENAME ure.pcp
 GLOBALFILEGID gid_File_Dl_Cppu
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -227,7 +224,6 @@ LibreOffice_SDK
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -275,7 +271,6 @@ LibreOffice_Dev_SDK
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -317,7 +312,6 @@ LibreOffice_Test
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -365,7 +359,6 @@ LibreOffice_Dev_Test
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -424,7 +417,6 @@ OxygenOffice
 PROGRESSSIZE 430,5
 PROGRESSPOSITION 5,230
 PROGRESSFRAMECOLOR 207,208,211
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 6a9d68b..f1d1e3d 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -202,7 +202,7 @@ sub generate_cab_file_list
 if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
 
 # to avoid lines with more than 256 characters, it can be useful 
to use relative paths
-if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = 
make_relative_ddf_path($sourcepath); }
+$sourcepath = make_relative_ddf_path($sourcepath);
 
 # all files with the same cabinetfile have increasing 
sequencenumbers
 
@@ -224,7 +224,7 @@ sub generate_cab_file_list
 $sourcepath =  $nextfile-{'sourcepath'};
 if ( $^O =~ /cygwin/i ) { $sourcepath = 
$nextfile-{'cyg_sourcepath'}; }
 # to avoid lines with more than 256 characters, it can be 
useful to use relative paths
-if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath 
= make_relative_ddf_path($sourcepath); }
+$sourcepath = make_relative_ddf_path($sourcepath);
 $uniquename =

[Libreoffice-commits] .: instsetoo_native/util

2012-02-08 Thread Petr Mladek

 instsetoo_native/util/makefile.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 62e8dfa072d78c18464db9a43ffc3f7b287032b2
Author: Petr Mladek pmla...@suse.cz
Date:   Wed Feb 8 17:46:59 2012 +0100

Create test packages even when SDK is disabled

Also fixed order in the other makefile target to make it clear
that it differs in the SDK

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 017836c..04acba4 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -95,13 +95,13 @@ ALLTAR  : $(LOCALPYFILES)
 .IF $(GUI)==WNT
 ALLTAR : openofficeall ooohelppack
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack)
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
 .ENDIF
 .ELSE
 .IF $(GUI)==WNT
 ALLTAR : openofficeall ooohelppack sdkooall
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) sdkoo_en-US $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
 .ENDIF
 .ENDIF
 .ELSE # $(ENABLE_RELEASE_BUILD)==TRUE
@@ -109,13 +109,13 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack 
$(eq,$(OS),MACOSX $(NULL)
 .IF $(GUI)==WNT
 ALLTAR : openofficedevall ooodevhelppack
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack)
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
 .ENDIF
 .ELSE
 .IF $(GUI)==WNT
 ALLTAR : openofficedevall ooodevhelppack sdkoodevall
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) sdkoodev_en-US $(eq,$(OS),MACOSX $(NULL) 
lodevtest_en-US)
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) 
sdkoodev_en-US
 .ENDIF
 .ENDIF
 .ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/util solenv/inc sysui/desktop

2011-12-05 Thread Petr Mladek

 instsetoo_native/util/openoffice.lst |   21 +++--
 solenv/inc/productversion.mk |2 +-
 sysui/desktop/freedesktop/freedesktop-menus.spec |2 +-
 sysui/desktop/mandriva/mandriva-menus.spec   |2 +-
 sysui/desktop/productversion.mk  |7 +++
 sysui/desktop/share/create_tree.sh   |7 ---
 sysui/desktop/share/makefile.mk  |8 
 sysui/desktop/suse/suse-menus.spec   |2 +-
 8 files changed, 30 insertions(+), 21 deletions(-)

New commits:
commit 8412548e734ddf699ddbffba0cf7edeb2548c86c
Author: Petr Mladek pmla...@suse.cz
Date:   Mon Dec 5 19:32:00 2011 +0100

allow to install desktop integration in Linux dev build

The desktop integration searched for the package name by the dash -
delimiter on many locations. It was not easy to add support for
package names with the dash.

In addition, there was an inconsistence. Most package names used the
libo-dev prefix name but the ure packages used lodev. It was
installed into the prefix /opt/lo-dev.

So, I remaned everything to lodev. It removed the inconsistence
and solved solution with the dash.

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 5cb2baa..2c73f1c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -170,12 +170,12 @@ LibreOffice_Dev
{
variables
{
-   PRODUCTNAME LibO-dev
+   PRODUCTNAME LOdev
PRODUCTVERSION 3.5
PRODUCTEXTENSION 
LONG_PRODUCTEXTENSION 
SHORT_PRODUCTEXTENSION beta0
-   UNIXBASISROOTNAME lo-dev
+   UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
@@ -183,13 +183,14 @@ LibreOffice_Dev
ABOUTBOXPRODUCTVERSION 3.5.0
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
-   BASISPACKAGEPREFIX libobasis-dev
+   BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
SOLSUREPACKAGEPREFIX lodev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN 
urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+   ADDSYSTEMINTEGRATION 1
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
@@ -227,7 +228,7 @@ LibreOffice_Dev
downloadname
LibO-dev_{productversion}_{os}_install_{languages}
langpackdownloadname
LibO_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibO_{productversion}_helppack_{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
+   include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{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
}
 }
 
@@ -325,18 +326,18 @@ LibreOffice_Dev_SDK
 downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
 variables
 {
-PRODUCTNAME LibO-dev
+PRODUCTNAME LOdev
 PRODUCTVERSION 3.5
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION beta0
-UNIXBASISROOTNAME lo-dev
+UNIXBASISROOTNAME lodev3.5
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
 PACKAGEVERSION 3.5.0
 PACKAGEREVISION {buildid}
-BASISPACKAGEPREFIX libobasis-dev
+BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
 SOLSUREPACKAGEPREFIX lodev
 REGISTRYLAYERNAME LayerDev
@@ -423,18 +424,18 @@ LibreOffice_Dev_Test

[Libreoffice-commits] .: instsetoo_native/util

2011-12-01 Thread Andras Timar

 instsetoo_native/util/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19f0d48364d19bc02dcca92a324fbdbd6cb57535
Author: Andras Timar ati...@suse.com
Date:   Thu Dec 1 13:41:07 2011 +0100

delete the space after 'qtz', too

otherwize double space will occur in the variable and
it will be replaced to ',,' instead of ',' - build fails

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index db11ea4..16cc3a6 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -81,7 +81,7 @@ help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d 
-name helpcontent2 2
 
 # do not build key is pseudolanguage for release builds
 .IF $(ENABLE_RELEASE_BUILD)==TRUE
-alllangiso:=$(alllangiso:s/qtz//)
+alllangiso:=$(alllangiso:s/qtz //)
 .ENDIF
 
 allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j 
 $i $(NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/util postprocess/prj scp2/prj scp2/source scp2/util setup_native/source smoketestoo_native/losmoketest smoketestoo_native/makefile.mk smoketestoo_native/prj s

2011-12-01 Thread Petr Mladek

 instsetoo_native/util/makefile.mk   |   34 +++-
 instsetoo_native/util/openoffice.lst|   98 +++
 instsetoo_native/util/pack.lst  |1 
 postprocess/prj/build.lst   |2 
 scp2/prj/build.lst  |3 
 scp2/prj/d.lst  |2 
 scp2/source/smoketest/makefile.mk   |   42 
 scp2/source/smoketest/module_smoketest.scp  |   50 +
 scp2/source/smoketest/module_smoketest.ulf  |   35 
 scp2/source/smoketest/smoketest.scp |  204 
 scp2/util/makefile.mk   |7 
 setup_native/source/packinfo/packinfo_test.txt  |   44 +
 smoketestoo_native/losmoketest  |   61 +++
 smoketestoo_native/makefile.mk  |4 
 smoketestoo_native/prj/build.lst|2 
 smoketestoo_native/prj/d.lst|3 
 solenv/bin/modules/installer/download.pm|4 
 solenv/gbuild/extensions/post_BuildplTargets.mk |3 
 18 files changed, 591 insertions(+), 8 deletions(-)

New commits:
commit 8c478c911033243df90ba290b32732a1fd70130e
Author: Petr Mladek pmla...@suse.cz
Date:   Fri Nov 25 19:30:08 2011 +0100

create installation set for tests

+ it currently includes just the smoketest and is available only for Linux

+ the side effect is that it builds the smoketest before instsetoo_native
+ it runs it only during dev-install when the variable RUN_SMOKETEST == YES

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 16cc3a6..39677d2 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -104,7 +104,7 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack 
$(eq,$(OS),MACOSX $(NULL)
 .IF $(GUI)==WNT
 ALLTAR : openofficeall ooohelppack sdkooall
 .ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) sdkoo_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooohelppack) sdkoo_en-US $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
 .ENDIF
 .ENDIF
 .ELSE # $(ENABLE_RELEASE_BUILD)==TRUE
@@ -118,7 +118,7 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack 
$(eq,$(OS),MACOSX $(
 .IF $(GUI)==WNT
 ALLTAR : openofficedevall ooodevhelppack sdkoodevall
 .ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) sdkoodev_en-US
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX 
$(NULL) ooodevhelppack) sdkoodev_en-US $(eq,$(OS),MACOSX $(NULL) 
lodevtest_en-US)
 .ENDIF
 .ENDIF
 .ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE
@@ -167,6 +167,10 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
 
 sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
 
+lotest: $(foreach,i,$(alllangiso) lotest_$i)
+
+lodevtest: $(foreach,i,$(alllangiso) lodevtest_$i)
+
 ure: $(foreach,i,$(alllangiso) ure_$i)
 
 oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
@@ -182,6 +186,7 @@ 
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
 MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
 MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
 MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
+MSITESTTEMPLATESOURCE=$(PRJ)$/inc_lotest$/windows$/msi_templates
 MSICOMMONTEMPLATESOURCE=$(PRJ)$/inc_common$/windows$/msi_templates
 
 NOLOGOSPLASH:=$(BIN)$/intro.zip
@@ -191,6 +196,7 @@ MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
 MSIHELPPACKTEMPLATEDIR=$(MISC)$/ooohelppack$/msi_templates
 MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
 MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
+MSITESTTEMPLATEDIR=$(MISC)$/lotest$/msi_templates
 
 ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
 .IF $(OS) == WNT
@@ -216,6 +222,10 @@ $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
 
+$(foreach,i,$(alllangiso) lotest_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) lodevtest_$i) : $(ADDDEPS)
+
 $(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
@@ -274,6 +284,15 @@ $(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 
LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate 
$(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip 
-format $(@:e:s/.//) $(VERBOSESWITCH)
 
+$(foreach,i,$(alllangiso) lotest_$i) : $$@{$(PKGFORMAT:^.)}
+lotest_%{$(PKGFORMAT:^.)} :
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f 
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p 
LibreOffice_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) 
-msilanguage $(COMMONMISC)$/win_ulffiles

[Libreoffice-commits] .: instsetoo_native/util

[Libreoffice-commits] .: instsetoo_native/util

[Libreoffice-commits] .: instsetoo_native/util solenv/bin

[Libreoffice-commits] .: instsetoo_native/util

[Libreoffice-commits] .: instsetoo_native/util solenv/inc sysui/desktop

[Libreoffice-commits] .: instsetoo_native/util

[Libreoffice-commits] .: instsetoo_native/util postprocess/prj scp2/prj scp2/source scp2/util setup_native/source smoketestoo_native/losmoketest smoketestoo_native/makefile.mk smoketestoo_native/prj s

7 matches

Site Navigation

Mail list logo

Footer information