Re: [BUILD] New unofficial, untested and unstable "Developer Snapshots" builds (rev. 1226179)

[Ariel Constenla-Haile]

Hi Oliver,

On Fri, Jan 06, 2012 at 09:10:33AM +0100, Oliver-Rainer Wittmann wrote:
> Hi Ariel,
> 
> just one question for my own builds:
> How do you assure that the developer snapshots are installed with
> another name and do not override stable installations?

you have to run, as usual, build --all in instsetoo_native/
and then, in instsetoo_native/util

dmake openofficedev
dmake ooodevlanguagepack
dmake sdkoodev


AFAIK this is the only method.
It has the drawback that you have to build *first* a normal install set
and *then* a developer snapshot.

To make things easier for me I use the attached patch, and configure
--with-devsnapshot

As I build language packs too, I added:

ALLTAR : openofficedev sdkoodev_en-US ure_en-US ooodevlanguagepack

you can remove ooodevlanguagepack if you don't need language packs.
It's a kind of hack, but it works for my needs :)

Regards
-- 
Ariel Constenla-Haile
La Plata, Argentina

diff --git a/configure.in b/configure.in
index 94faa84..b5fb100 100644
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,9 @@ AC_REVISION( $Revision: 1.290 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
+AC_ARG_ENABLE(devsnapshot,
+[  --enable-devsnapshot        Build a Developer Snapshot
+],,enable_devsnapshot="no")
 AC_ARG_WITH(dmake-path,
 [  --with-dmake-path=<PATH TO EXECUTABLE>   Specify the location of dmake ],
 [  DMAKE_PATH="$withval"
@@ -908,8 +911,22 @@ AC_MSG_CHECKING([configure is up-to-date])
 if test "configure" -ot "configure.in"
 then
    AC_MSG_ERROR([configure is not up-to-date, run autoconf first!])
+else
+    AC_MSG_RESULT([yes])
 fi
 
+
+AC_MSG_CHECKING([whether to build a Developer Snapshot])
+if test "$enable_devsnapshot" = "yes"; then
+    DEVELOPER_SNAPSHOT="TRUE"
+    AC_MSG_RESULT([yes])
+else
+    DEVELOPER_SNAPSHOT=""
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(DEVELOPER_SNAPSHOT)
+
+
 AC_PROG_EGREP
 AC_PROG_AWK
 AC_PATH_PROG( AWK, $AWK)
diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index db528db..817343c 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -86,8 +86,12 @@ ALLTAR  : $(LOCALPYFILES)
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
 ALLTAR : openoffice
 .ELSE
+.IF "$(DEVELOPER_SNAPSHOT)"=="TRUE"
+ALLTAR : openofficedev sdkoodev_en-US ure_en-US ooodevlanguagepack
+.ELSE
 ALLTAR : openoffice sdkoo_en-US ure_en-US
 .ENDIF
+.ENDIF
 .ELSE                  # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 ALLTAR : updatepack
 .ENDIF                 # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
diff --git a/set_soenv.in b/set_soenv.in
index 2e32307..8fcefa5 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1770,7 +1770,7 @@ if ( $platform =~ m/cygwin/ )
 }
 ToFile( "ENABLE_HUNSPELL",     "@ENABLE_HUNSPELL@", "e" );
 ToFile( "ENABLE_HYPHEN",       "@ENABLE_HYPHEN@", "e" );
-
+ToFile( "DEVELOPER_SNAPSHOT","@DEVELOPER_SNAPSHOT@","e");
 ToFile( "PERL",              $PERL,              "e" );
 ToFile( "RPM",               "@RPM@",            "e" );
 ToFile( "DPKG",              "@DPKG@",           "e" );

pgplXKpG2fL0g.pgp
Description: PGP signature