Permalink
Browse files

Added themability at compile time.

  • Loading branch information...
1 parent 50aea69 commit 9b1361cb8770609e53f01f8801a092f68f96f878 graziano committed Aug 26, 2009
Showing with 59 additions and 3 deletions.
  1. +5 −1 Makedefs.in
  2. +14 −1 clc/Makefile
  3. +1 −1 clc/modules/www/conf/eucalyptus-web.properties
  4. +24 −0 configure
  5. +15 −0 configure.ac
View
@@ -30,7 +30,7 @@ bindir = ${prefix}/usr/bin
sbindir = ${prefix}/usr/sbin
datarootdir = ${usrdir}/share
-# where we are going to install eucalyptus, and Co.
+# where we are going to install eucalyptus and where are the sources
export EUCALYPTUS = ${prefix}
TOP = @TOP@
@@ -44,3 +44,7 @@ INSTALL = @INSTALL@
ANT = @ANT@ -e
WSDL2C = @WSDL2C@
JAVA_HOME = @JAVA_HOME@
+
+# compile time configurations
+euca_theme = @INTERFACE_THEME@
+store_tab = @STORE@
View
@@ -3,12 +3,25 @@
#
include ../Makedefs
+theme_dir = ${TOP}/clc/modules/www/src/main/java/edu/ucsb/eucalyptus/admin/public/themes/
+
all: build
deps:
$(ANT) deps
-build:
+themes:
+ @if test -n ${euca_theme} ; then \
+ if test -d ${theme_dir}/${euca_theme} ; then \
+ ln -sf ${theme_dir}/${euca_theme} ${theme_dir}/active;\
+ else \
+ echo "Theme ${euca_theme} does not exists!"; exit 1;\
+ fi; fi
+ @if test ${store_tab} = "Y" ; then \
+ sed -i "s/\(^extensions =\).*/\1 store/" ${TOP}/clc/modules/www/conf/eucalyptus-web.properties ; else \
+ sed -i "s/\(^extensions =\).*/\1/" ${TOP}/clc/modules/www/conf/eucalyptus-web.properties; fi
+
+build: themes
@# we need JAVA_HOME
@if test -z "${JAVA_HOME}" ; then \
echo "You need to define JAVA_HOME!"; exit 1; fi
@@ -97,6 +97,6 @@ logo-file = themes/active/img/logo.png
rightscale-registration-base-url = https://my.rightscale.com/cloud_registrations/new?callback_url=
-extensions =
+extensions = store
truth = beauty
View
@@ -595,6 +595,8 @@ ac_includes_default="\
ac_header_list=
ac_func_list=
ac_subst_vars='LTLIBOBJS
+INTERFACE_THEME
+STORE
INCLUDES
LIBVIRT_HOME
AXIS2_HOME
@@ -667,6 +669,8 @@ with_axis2c
with_axis2c_services
with_axis2
with_libvirt
+with_interface_theme
+enable_appliance_store
enable_debug
'
ac_precious_vars='build_alias
@@ -1288,6 +1292,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-appliance-store enable the store tab
--enable-debug include debugging info when compiling
Optional Packages:
@@ -1297,6 +1302,7 @@ Optional Packages:
--with-axis2c-services=<dir> where axis2c services are installed
--with-axis2=<dir> where axis2 is installed
--with-libvirt=<dir> where libvirt is installed
+ --with-interface-there=<name> the theme to be used
Some influential environment variables:
CC C compiler command
@@ -3446,6 +3452,8 @@ AXIS2C_HOME="${AXIS2C_HOME}"
AXIS2_HOME="${AXIS2_HOME}"
AXIS2C_SERVICES=""
LIBVIRT_HOME="${LIBVIRT_HOME}"
+INTERFACE_THEME="eucalyptus"
+STORE="N"
ANT=""
JAVA=""
WSDL2C=""
@@ -3486,6 +3494,20 @@ if test "${with_libvirt+set}" = set; then :
withval=$with_libvirt; LIBVIRT_HOME="${withval}"
fi
+
+# Check whether --with-interface-theme was given.
+if test "${with_interface_theme+set}" = set; then :
+ withval=$with_interface_theme; INTERFACE_THEME="${withval}"
+fi
+
+# Check whether --enable-appliance-store was given.
+if test "${enable_appliance_store+set}" = set; then :
+ enableval=$enable_appliance_store; if test "${enableval}" != "no"; then
+ STORE="Y"
+ fi
+fi
+
+
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; if test "${enableval}" != "no"; then
@@ -7014,6 +7036,8 @@ _ACEOF
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
View
@@ -6,6 +6,8 @@
# configure [--with-axis2c=<dir>]
# [--with-axis2=<dir>]
# [--with-libvirt=<dir>]
+# [--with-interface-theme=<name>]
+# [--enable-appliance-store]
# [--enable-debug]
AC_PREREQ(2.61)
@@ -30,6 +32,8 @@ AXIS2C_HOME="${AXIS2C_HOME}"
AXIS2_HOME="${AXIS2_HOME}"
AXIS2C_SERVICES=""
LIBVIRT_HOME="${LIBVIRT_HOME}"
+INTERFACE_THEME="eucalyptus"
+STORE="N"
ANT=""
JAVA=""
WSDL2C=""
@@ -58,6 +62,15 @@ AC_ARG_WITH(axis2,
AC_ARG_WITH(libvirt,
[ --with-libvirt=<dir> where libvirt is installed],
[LIBVIRT_HOME="${withval}"])
+AC_ARG_WITH(interface-theme,
+ [ --with-interface-there=<name> the theme to be used],
+ [INTERFACE_THEME="${withval}"])
+AC_ARG_ENABLE(appliance-store,
+ [ --enable-appliance-store enable the store tab],
+ [if test "${enableval}" != "no"; then
+ STORE="Y"
+ fi])
+
AC_ARG_ENABLE(debug,
[ --enable-debug include debugging info when compiling],
[if test "${enableval}" != "no"; then
@@ -229,6 +242,8 @@ AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
AC_SUBST(INCLUDES)
+AC_SUBST(STORE)
+AC_SUBST(INTERFACE_THEME)

0 comments on commit 9b1361c

Please sign in to comment.