From 1189941fe485b8e6dd88801c89590fb08912c47b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 10 Oct 2005 13:10:40 +0000 Subject: [PATCH] Require Bacula source on ./configure + pickup Bacula version + separate bacula-web and bimagemgr into different .tar.gz files git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2428 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/.cvsignore | 1 + gui/Makefile | 43 +++++++++++++++++++++++++--- gui/Makefile.in | 40 ++++++++++++++++++++------ gui/README | 5 ++-- gui/autoconf/configure.in | 48 ++++++++++++++++++------------- gui/configure | 60 +++++++++++++++++++++++---------------- 6 files changed, 139 insertions(+), 58 deletions(-) diff --git a/gui/.cvsignore b/gui/.cvsignore index d521238cec..e1649d8074 100644 --- a/gui/.cvsignore +++ b/gui/.cvsignore @@ -3,3 +3,4 @@ config.status config.out config.log autom4te.cache +kernsconfig diff --git a/gui/Makefile b/gui/Makefile index ef81315d92..6ba07104f2 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -6,9 +6,9 @@ # autoconf/Make.common.in -*- Makefile -*- # release date (man), LSM date, version number/name, current maintainer -DATE="@DATE@" +DATE="08 October 2005" LSMDATE=@LSMDATE@ -VERSION=@VERSION@ +VERSION=1.37.41 VERNAME=bacula-$(VERSION)# MAINT=Kern Sibbald# MAINTEMAIL=# @@ -89,15 +89,50 @@ Makefiles: $(SHELL) config.status clean: - @$(RMF) *~ 1 2 3 + @$(RMF) *~ 1 2 3 diff */diff *.tar.gz # clean for distribution distclean: clean - @$(RMF) -r CVS + @$(RMF) -rf CVS devclean: clean @for subdir in freebsd linux solaris; do \ if [ -f $${subdir}/Makefile ]; then \ (cd $${subdir}; $(MAKE) devclean) \ fi; \ + +release-bacula-web: + (cwd=`pwd`; rm -rf /tmp/bacula-web-$(VERSION); \ + cd ..; cp -rp $$cwd/bacula-web /tmp/bacula-web-$(VERSION); \ + cd /tmp/bacula-web-$(VERSION); \ + make clean; \ + find . -name ".#*" -exec rm -rf {} \; ; \ + find . -name "CVS" -exec rm -rf {} \; ; \ + find . -name ".cvsignore" -exec rm -rf {} \; ; \ + rm -rf autom4te.cache; \ + cd ..; \ + tar cvfz $$cwd/bacula-web-$(VERSION).tar.gz bacula-web-$(VERSION); \ + rm -rf /tmp/bacula-web-$(VERSION); \ + echo " "; \ + echo "bacula-web release is in: $$cwd/bacula-web-$(VERSION).tar.gz"; \ + echo " ") + +release-bimagemgr: + (cwd=`pwd`; rm -rf /tmp/bimagemgr-$(VERSION); \ + cd ..; cp -rp $$cwd/bimagemgr /tmp/bimagemgr-$(VERSION); \ + cd /tmp/bimagemgr-$(VERSION); \ + make clean; \ + find . -name ".#*" -exec rm -rf {} \; ; \ + find . -name "CVS" -exec rm -rf {} \; ; \ + find . -name ".cvsignore" -exec rm -rf {} \; ; \ + rm -rf autom4te.cache; \ + cd ..; \ + tar cvfz $$cwd/bimagemgr-$(VERSION).tar.gz bimagemgr-$(VERSION); \ + rm -rf /tmp/bimagemgr-$(VERSION); \ + echo " "; \ + echo "bimagemgr release is in: $$cwd/bimagemgr-$(VERSION).tar.gz"; \ + echo " ") + +release: clean release-bacula-web release-bimagemgr + # ------------------------------------------------------------------------ diff --git a/gui/Makefile.in b/gui/Makefile.in index b0bdc42050..16f4292aed 100755 --- a/gui/Makefile.in +++ b/gui/Makefile.in @@ -47,7 +47,7 @@ Makefiles: $(SHELL) config.status clean: - @$(RMF) *~ 1 2 3 + @$(RMF) *~ 1 2 3 diff */diff *.tar.gz # clean for distribution distclean: clean @@ -59,14 +59,38 @@ devclean: clean (cd $${subdir}; $(MAKE) devclean) \ fi; \ -release: clean - (cwd=`pwd`; rm -rf /tmp/bacula-gui-$(VERSION); \ - cd ..; cp -rp $$cwd /tmp/bacula-gui-$(VERSION); \ - cd /tmp; \ - tar cvfz $$cwd/bacula-gui-$(VERSION).tar.gz bacula-gui-$(VERSION); \ - rm -rf /tmp/bacula-gui-$(VERSION); \ +release-bacula-web: + (cwd=`pwd`; rm -rf /tmp/bacula-web-$(VERSION); \ + cd ..; cp -rp $$cwd/bacula-web /tmp/bacula-web-$(VERSION); \ + cd /tmp/bacula-web-$(VERSION); \ + make clean; \ + find . -name ".#*" -exec rm -rf {} \; ; \ + find . -name "CVS" -exec rm -rf {} \; ; \ + find . -name ".cvsignore" -exec rm -rf {} \; ; \ + rm -rf autom4te.cache; \ + cd ..; \ + tar cvfz $$cwd/bacula-web-$(VERSION).tar.gz bacula-web-$(VERSION); \ + rm -rf /tmp/bacula-web-$(VERSION); \ echo " "; \ - echo "Release is in: $$cwd/bacula-gui-$(VERSION).tar.gz"; \ + echo "bacula-web release is in: $$cwd/bacula-web-$(VERSION).tar.gz"; \ echo " ") +release-bimagemgr: + (cwd=`pwd`; rm -rf /tmp/bimagemgr-$(VERSION); \ + cd ..; cp -rp $$cwd/bimagemgr /tmp/bimagemgr-$(VERSION); \ + cd /tmp/bimagemgr-$(VERSION); \ + make clean; \ + find . -name ".#*" -exec rm -rf {} \; ; \ + find . -name "CVS" -exec rm -rf {} \; ; \ + find . -name ".cvsignore" -exec rm -rf {} \; ; \ + rm -rf autom4te.cache; \ + cd ..; \ + tar cvfz $$cwd/bimagemgr-$(VERSION).tar.gz bimagemgr-$(VERSION); \ + rm -rf /tmp/bimagemgr-$(VERSION); \ + echo " "; \ + echo "bimagemgr release is in: $$cwd/bimagemgr-$(VERSION).tar.gz"; \ + echo " ") + +release: clean release-bacula-web release-bimagemgr + # ------------------------------------------------------------------------ diff --git a/gui/README b/gui/README index ac262804ed..580e27a51b 100644 --- a/gui/README +++ b/gui/README @@ -44,6 +44,7 @@ To create a distribution tar file (NOT YET IMPLEMENTED!!!!!) make make release - The output will be a .tar.gz file in the current directory - with the name bacula-gui-.tar.gz + The output will be two .tar.gz files in the current directory + with the names bacula-web-.tar.gz and + bimagemgr-.tar.gz It will print the name. diff --git a/gui/autoconf/configure.in b/gui/autoconf/configure.in index 0bc4b18513..66f93a7dd2 100644 --- a/gui/autoconf/configure.in +++ b/gui/autoconf/configure.in @@ -14,6 +14,34 @@ dnl require a recent autoconf AC_PREREQ(2.13) +# ------------------------------------------ +# Where to get Bacula source +# ------------------------------------------ +AC_ARG_WITH(bacula, + [ --with-bacula=PATH specify path to Bacula source], + [ + if test "x$withval" != "xno" ; then + bacula=$withval + fi + ] +) + +AC_SUBST(bacula) +if test "x$bacula" = "x" ; then + AC_MSG_ERROR(The Bacula source directory must be specified. Use --with-bacula=) +fi + +dnl Bacula version +VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${bacula}/src/version.h` +DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${bacula}/src/version.h` +AC_SUBST(VERSION)dnl +AC_SUBST(DATE)dnl +if test "x$VERSION" = "x" ; then + AC_MSG_ERROR(Bacula version not found) +fi +echo "configuring for Bacula source $VERSION ($DATE)" + + dnl search for true and false programs. AC_PATH_PROGS(TRUEPRG, true, :) AC_PATH_PROGS(FALSEPRG, false, :) @@ -34,14 +62,6 @@ THE_AWK=$AWK AC_PATH_PROG(AWK, $THE_AWK, $THE_AWK) -dnl Bacula version -#VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/version.h` -#DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/version.h` -#AC_SUBST(VERSION)dnl -#AC_SUBST(DATE)dnl -#echo "configuring for Bacula $VERSION ($DATE)" - - dnl ------------------------------------------------------- dnl# Check for programs. dnl ------------------------------------------------------ @@ -74,17 +94,6 @@ dnl# -------------------------------------------------------------------------- dnl# CHECKING COMMAND LINE OPTIONS dnl# -------------------------------------------------------------------------- -# ------------------------------------------ -# Where to get Bacula source -# ------------------------------------------ -AC_ARG_WITH(bacula, - [ --with-bacula=PATH specify path to Bacula source], - [ - if test "x$withval" != "xno" ; then - bacula=$withval - fi - ] -) # ------------------------------------------------------------------------- # Set variables for bimagemgr installation @@ -272,7 +281,6 @@ echo " Configuration on `date`: Host: $host -- ${DISTNAME} ${DISTVER} - Bacula version: ${VERSION} (${DATE}) Source code location: ${bacula} " > config.out diff --git a/gui/configure b/gui/configure index 2537a9d58f..1ddab913d8 100755 --- a/gui/configure +++ b/gui/configure @@ -272,7 +272,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="autoconf/configure.in" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MV RM CP ECHO AR build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup bacula hostname DISTNAME DISTVER LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR bacula VERSION DATE TRUEPRG FALSEPRG AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MV RM CP ECHO AR build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup hostname DISTNAME DISTVER LIBOBJS LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -1264,6 +1264,38 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +# ------------------------------------------ +# Where to get Bacula source +# ------------------------------------------ + +# Check whether --with-bacula or --without-bacula was given. +if test "${with_bacula+set}" = set; then + withval="$with_bacula" + + if test "x$withval" != "xno" ; then + bacula=$withval + fi + + +fi; + + +if test "x$bacula" = "x" ; then + { { echo "$as_me:$LINENO: error: The Bacula source directory must be specified. Use --with-bacula=" >&5 +echo "$as_me: error: The Bacula source directory must be specified. Use --with-bacula=" >&2;} + { (exit 1); exit 1; }; } +fi + +VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${bacula}/src/version.h` +DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${bacula}/src/version.h` +if test "x$VERSION" = "x" ; then + { { echo "$as_me:$LINENO: error: Bacula version not found" >&5 +echo "$as_me: error: Bacula version not found" >&2;} + { (exit 1); exit 1; }; } +fi +echo "configuring for Bacula source $VERSION ($DATE)" + + for ac_prog in true do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1454,13 +1486,6 @@ fi -#VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/version.h` -#DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/version.h` -#AC_SUBST(VERSION)dnl -#AC_SUBST(DATE)dnl -#echo "configuring for Bacula $VERSION ($DATE)" - - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2213,20 +2238,6 @@ fi -# ------------------------------------------ -# Where to get Bacula source -# ------------------------------------------ - -# Check whether --with-bacula or --without-bacula was given. -if test "${with_bacula+set}" = set; then - withval="$with_bacula" - - if test "x$withval" != "xno" ; then - bacula=$withval - fi - - -fi; # ------------------------------------------------------------------------- # Set variables for bimagemgr installation @@ -3064,6 +3075,9 @@ s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t s,@BUILD_DIR@,$BUILD_DIR,;t t +s,@bacula@,$bacula,;t t +s,@VERSION@,$VERSION,;t t +s,@DATE@,$DATE,;t t s,@TRUEPRG@,$TRUEPRG,;t t s,@FALSEPRG@,$FALSEPRG,;t t s,@AWK@,$AWK,;t t @@ -3113,7 +3127,6 @@ s,@bimagemgr_binowner@,$bimagemgr_binowner,;t t s,@bimagemgr_bingroup@,$bimagemgr_bingroup,;t t s,@bimagemgr_dataowner@,$bimagemgr_dataowner,;t t s,@bimagemgr_datagroup@,$bimagemgr_datagroup,;t t -s,@bacula@,$bacula,;t t s,@hostname@,$hostname,;t t s,@DISTNAME@,$DISTNAME,;t t s,@DISTVER@,$DISTVER,;t t @@ -3514,7 +3527,6 @@ echo " Configuration on `date`: Host: $host -- ${DISTNAME} ${DISTVER} - Bacula version: ${VERSION} (${DATE}) Source code location: ${bacula} " > config.out -- 2.39.2