[Libreoffice-commits] .: 2 commits - configure.in scp2/source set_soenv.in
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Dec 9 04:58:30 PST 2010
configure.in | 29 +++++++++++++++++++++++++++--
scp2/source/ooo/file_ooo.scp | 10 ++++++++++
scp2/source/ooo/module_hidden_ooo.scp | 16 ++++++++++++++--
set_soenv.in | 1 +
4 files changed, 52 insertions(+), 4 deletions(-)
New commits:
commit 51ecc77bece46ee40134845af42ccb220f36bd07
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Dec 9 12:56:49 2010 +0000
rename to with_themes, and test scp2 a little
diff --git a/configure.in b/configure.in
index 7007d3f..9c9c842 100755
--- a/configure.in
+++ b/configure.in
@@ -487,12 +487,6 @@ AC_ARG_ENABLE(extra-font,
[Add extra font content.]),
,)
-AC_ARG_ENABLE(theme,
- AS_HELP_STRING([--enable-theme="theme1 theme2..."],
- [Choose which themes to include. By default all available themes are included.
- Possible choices: crystal, hicontrast, oxygen, tango.]),
-,)
-
dnl ---------- Deprecated since 2010-11-05 ----------
AC_ARG_ENABLE(mysql-connector,
@@ -605,6 +599,12 @@ AC_ARG_WITH(vba-package-format,
],
,)
+AC_ARG_WITH(theme,
+ AS_HELP_STRING([--with-theme="theme1 theme2..."],
+ [Choose which themes to include. By default those themes with an '*' are included.
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+,)
+
AC_ARG_WITH(extension-integration,
AS_HELP_STRING([--with-extension-integration],
[It will integrate the builded extensions to the installer of the product.]),
@@ -7320,6 +7320,24 @@ else
fi
dnl ===================================================================
+dnl Test which themes to include
+dnl ===================================================================
+AC_MSG_CHECKING([which themes to include])
+# if none given, use all available themes
+if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
+ enable_theme="default crystal hicontrast oxygen tango"
+fi
+
+ WITH_THEMES=""
+ for theme in $enable_theme
+ do
+ WITH_THEMES="$WITH_THEMES $theme"
+ SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
+ done
+ AC_MSG_RESULT([$WITH_THEMES])
+AC_SUBST(WITH_THEMES)
+
+dnl ===================================================================
dnl Test whether to integrate extensions into the product's installer
dnl ===================================================================
AC_MSG_CHECKING([for extensions integration])
@@ -7642,26 +7660,6 @@ fi
AC_SUBST(WITH_EXTRA_FONT)
dnl ===================================================================
-dnl Test which themes to include
-dnl ===================================================================
-AC_MSG_CHECKING([which themes to include])
-# if none given, use all available themes
-if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
- enable_theme="crystal hicontrast oxygen tango"
-fi
-
- ENABLE_THEMES=""
- for theme in $enable_theme
- do
- ENABLE_THEMES="$ENABLE_THEMES $theme"
- SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
- done
- AC_MSG_RESULT([$ENABLE_THEMES])
-
-AC_SUBST(ENABLE_THEMES)
-AC_SUBST(SCPDEFS)
-
-dnl ===================================================================
dnl Test whether to enable ActiveX embedding
dnl ===================================================================
if test "$_os" = "WINNT"; then
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 64d91e5..8c425b8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1836,12 +1836,14 @@ File gid_File_Jar_Productregistration
End
#endif
+#ifdef THEME_DEFAULT
File gid_File_Images_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images.zip";
Styles = (PACKED);
End
+#endif
#ifdef THEME_CRYSTAL
File gid_File_ImagesCrystal_Zip
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 84f96a5..d5214eb 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -766,11 +766,23 @@ Module gid_Module_Root_Files_Images
Sortkey = "2050";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Images_Zip,
+ Files = (
+#ifdef THEME_DEFAULT
+ gid_File_Images_Zip,
+#endif
+#ifdef THEME_CRYSTAL
gid_File_ImagesCrystal_Zip,
+#endif
+#ifdef THEME_OXYGEN
gid_File_ImagesOxygen_Zip,
+#endif
+#ifdef THEME_HICONTRAST
gid_File_ImagesHicontrast_Zip,
- gid_File_ImagesTango_Zip);
+#endif
+#ifdef THEME_TANGO
+ gid_File_ImagesTango_Zip
+#endif
+ );
End
#ifndef WITHOUT_FONTS
diff --git a/set_soenv.in b/set_soenv.in
index 4985cb0..855d184 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1694,8 +1694,8 @@ ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
-ToFile( "ENABLE_THEMES", "@ENABLE_THEMES@","e");
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
+ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" );
ToFile( "SAC_JAR", "@SAC_JAR@", "e" );
ToFile( "LIBXML_JAR", "@LIBXML_JAR@", "e" );
commit c6c7816f9051d251545b935a0cbf19559d7c701d
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Thu Dec 9 13:17:41 2010 +0100
v3 of the configure.in/scp2 patch to allow selecting themes
DOH, here comes v3, I left a debug output in configure.in in v2, otherwise no change. Sorry
Sebastian
>From 6c379488250f5a3349dfc2d805f70a0f084fe07d Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date: Thu, 9 Dec 2010 12:23:55 +0100
Subject: [PATCHv3] Introduce an --enable-theme="theme1 theme2..." option
By default, we include all defaults as before, but if given, we can
limit the number of included themes with e.g. --enable-theme="oxygen
tango". This is passed through set_soenv and sets the environment
variable ENABLE_THEMES="...." which can be used by the packimages
makefile in the postprocess repository. It also adds defines in the
form of THEME_OXYGEN that are being used in the scp2 module to decide
if we should install the theme file or not.
Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
diff --git a/configure.in b/configure.in
index 7fe1e95..7007d3f 100755
--- a/configure.in
+++ b/configure.in
@@ -487,6 +487,12 @@ AC_ARG_ENABLE(extra-font,
[Add extra font content.]),
,)
+AC_ARG_ENABLE(theme,
+ AS_HELP_STRING([--enable-theme="theme1 theme2..."],
+ [Choose which themes to include. By default all available themes are included.
+ Possible choices: crystal, hicontrast, oxygen, tango.]),
+,)
+
dnl ---------- Deprecated since 2010-11-05 ----------
AC_ARG_ENABLE(mysql-connector,
@@ -7635,8 +7641,29 @@ else
fi
AC_SUBST(WITH_EXTRA_FONT)
+dnl ===================================================================
+dnl Test which themes to include
+dnl ===================================================================
+AC_MSG_CHECKING([which themes to include])
+# if none given, use all available themes
+if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
+ enable_theme="crystal hicontrast oxygen tango"
+fi
+
+ ENABLE_THEMES=""
+ for theme in $enable_theme
+ do
+ ENABLE_THEMES="$ENABLE_THEMES $theme"
+ SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
+ done
+ AC_MSG_RESULT([$ENABLE_THEMES])
+
+AC_SUBST(ENABLE_THEMES)
AC_SUBST(SCPDEFS)
+dnl ===================================================================
+dnl Test whether to enable ActiveX embedding
+dnl ===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([whether to enable ActiveX embedding of LibO components])
if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0ab9fa2..64d91e5 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1843,33 +1843,41 @@ File gid_File_Images_Zip
Styles = (PACKED);
End
+#ifdef THEME_CRYSTAL
File gid_File_ImagesCrystal_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images_crystal.zip";
Styles = (PACKED);
End
+#endif
+#ifdef THEME_OXYGEN
File gid_File_ImagesOxygen_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images_oxygen.zip";
Styles = (PACKED);
End
+#endif
+#ifdef THEME_HICONTRAST
File gid_File_ImagesHicontrast_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images_hicontrast.zip";
Styles = (PACKED);
End
+#endif
+#ifdef THEME_TANGO
File gid_File_ImagesTango_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images_tango.zip";
Styles = (PACKED);
End
+#endif
File gid_File_Share_Registry_Lingucomponent_Xcd
TXT_FILE_BODY;
diff --git a/set_soenv.in b/set_soenv.in
index cc41e61..4985cb0 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1694,6 +1694,7 @@ ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
+ToFile( "ENABLE_THEMES", "@ENABLE_THEMES@","e");
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" );
ToFile( "SAC_JAR", "@SAC_JAR@", "e" );
More information about the Libreoffice-commits
mailing list