- Build boinc zip compression library as part of normal ./configure && make process

- make install now installs libboinc_zip.a as part of normal make install - Unix boinc client and boinc gui had the same name, eg boinc_4.56_i686-pc-linux-gnu I have changed this so that it is now boinc_client_4.56_i686-pc-linux-gnu and boinc_gui_4.56_i686-pc-linux-gnu. If the change from boinc_ to boinc_client_ causes any pain, please just modify CLIENT_BIN_FILENAME in configure.ac - Removed -O3 as required compilation flag in building client gui. Only needed for client (to optimize benchmarking routines). - Removed un-necessary zip/configure.ac and zip/Makefile - Added .cvsignore file for zip/ directory. svn path=/trunk/boinc/; revision=4627
2004-11-23 12:54:33 +00:00 · 2004-11-23 12:54:33 +00:00 · 335242811e
parent 1270155e0f
commit 335242811e
8 changed files with 56 additions and 1256 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -3,7 +3,7 @@

 AUTOMAKE_OPTIONS = foreign

-API_SUBDIRS = api lib boincglut apps
+API_SUBDIRS = api lib boincglut apps zip

 if ENABLE_SERVER
   SERVER_SUBDIRS = db tools test py sched
--- a/23
+++ b/23
@ -20026,3 +20026,26 @@ Rom    22 Nov 2004
        gui_rpc_client.C, .h
    win_build/installerv2/
        BOINC.ism
+
+Bruce 23 Nov 2004 UTC
+    - Build boinc zip compression library as part of normal ./configure && make process
+    - make install now installs libboinc_zip.a as part of normal make install
+    - Unix boinc client and boinc gui had the same name, eg boinc_4.56_i686-pc-linux-gnu
+      I have changed this so that it is now boinc_client_4.56_i686-pc-linux-gnu and
+      boinc_gui_4.56_i686-pc-linux-gnu.  If the change from boinc_ to boinc_client_
+      causes any pain, please just modify CLIENT_BIN_FILENAME in configure.ac
+    - Removed -O3 as required compilation flag in building client gui.  Only needed for
+      client (to optimize benchmarking routines).
+    - Removed un-necessary zip/configure.ac and zip/Makefile
+    - Added .cvsignore file for zip/ directory.
+
+    configure.ac
+    Makefile.am
+    clientgui/
+     Makefile.am
+    zip/
+     Makefile.am
+     configure.ac (removed)
+     Makefile (removed)
+     .cvsignore (added)
+     
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@ -6,9 +6,9 @@ include $(top_srcdir)/Makefile.incl
 # by default, "-static -static-libgcc" on linux.
 #STATIC_FLAGS=@STATIC_FLAGS@

-bin_PROGRAMS = boincgui
+bin_PROGRAMS = boinc_gui

-boincgui_SOURCES = \
+boinc_gui_SOURCES = \
    BOINCBaseView.cpp \
    BOINCGUIApp.cpp \
    BOINCListCtrl.cpp \
@ -34,12 +34,12 @@ boincgui_SOURCES = \
    ../lib/parse.C \
    ../lib/util.C

-boincgui_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(CLIENTGUIFLAGS) -O3
-boincgui_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(CLIENTGUIFLAGS) -O3
-boincgui_LDADD = $(PTHREAD_LIBS) $(WX_LIBS) $(CLIENTGUILIBS)
+boinc_gui_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(CLIENTGUIFLAGS)
+boinc_gui_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(CLIENTGUIFLAGS)
+boinc_gui_LDADD = $(PTHREAD_LIBS) $(WX_LIBS) $(CLIENTGUILIBS)

-all-local: client-bin
-client-bin: @CLIENT_BIN_FILENAME@
+all-local: client_gui-bin
+client_gui-bin: @CLIENT_GUI_BIN_FILENAME@

 win_config.h: $(top_srcdir)/config.h
 	grep '#define.*BOINC.*VERSION' $^ > $@
@ -47,11 +47,11 @@ win_config.h: $(top_srcdir)/config.h
 version: win_config.h

 # make a hard link to the client name.
-@CLIENT_BIN_FILENAME@: boincgui
+@CLIENT_GUI_BIN_FILENAME@: boinc_gui
 	rm -f $@
 	ln $? $@

 clean-local:
-	rm -f @CLIENT_BIN_FILENAME@
+	rm -f @CLIENT_GUI_BIN_FILENAME@

 .PHONY: version
--- a/configure.ac
+++ b/configure.ac
@ -90,7 +90,8 @@ AC_DEFINE_UNQUOTED([BOINC_VERSION_STRING], "$BOINC_VERSION_STRING", [String repr
 AC_DEFINE_UNQUOTED([BOINC_MAJOR_VERSION], $BOINC_MAJOR_VERSION, [Major part of BOINC version number])
 AC_DEFINE_UNQUOTED([BOINC_MINOR_VERSION], $BOINC_MINOR_VERSION, [Minor part of BOINC version number])
 AC_DEFINE_UNQUOTED([HOSTTYPE], "$host", [Host for this compilation])
-AC_SUBST([CLIENT_BIN_FILENAME],[boinc_]AC_PACKAGE_VERSION[_$host${EXEEXT}])
+AC_SUBST([CLIENT_BIN_FILENAME],[boinc_client_]AC_PACKAGE_VERSION[_$host${EXEEXT}])
+AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boinc_gui_]AC_PACKAGE_VERSION[_$host${EXEEXT}])
 AC_SUBST([TOP_BUILD_DIR], [`pwd`])
 AC_SUBST([TOP_SOURCE_DIR], [`(cd \`dirname "$0"\` && pwd)`])

@ -264,32 +265,34 @@ dnl fi
 dnl echo "checking static flags... ${STATIC_FLAGS:-(none)}"]
 dnl AC_SUBST(STATIC_FLAGS)

-AC_CONFIG_FILES([Makefile
-                 RSAEuro/source/Makefile
-                 RSAEuro/Makefile
+AC_CONFIG_FILES([
                 api/Makefile
-                 boincglut/Makefile
-                 boincglut/lib/Makefile
-                 boincglut/lib/glut/Makefile
-                 boincglut/include/Makefile
                 apps/Makefile
-                 client/Makefile
+                 boincglut/include/Makefile
+                 boincglut/lib/glut/Makefile
+                 boincglut/lib/Makefile
+                 boincglut/Makefile
                 clientgui/Makefile
+                 client/Makefile
+                 client/win/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
                 db/Makefile
                 lib/Makefile
+                 Makefile
+                 py/Boinc/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
+                 py/Boinc/Makefile
+                 py/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
+                 py/Boinc/version.py
+                 py/Makefile
+                 RSAEuro/Makefile
+                 RSAEuro/source/Makefile
+                 sched/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
                 sched/Makefile
-                 tools/Makefile
+                 test/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
                 test/Makefile
                 test/version.inc
-                 py/Makefile
-                 py/Boinc/Makefile
-                 py/Boinc/version.py
-                 py/Boinc/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
-                 py/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
-                 client/win/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
-                 sched/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
                 tools/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
-                 test/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
+                 tools/Makefile
+                 zip/Makefile
                 ])

 dnl AC_CONFIG_HEADER([config.h])
--- a/zip/.cvsignore
+++ b/zip/.cvsignore
@ -0,0 +1 @@
+Makefile.in
--- a/zip/Makefile
+++ b/zip/Makefile
--- a/zip/Makefile.am
+++ b/zip/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = -pthread \
 -DUNIX

 ##noinst_PROGRAMS = test
-noinst_LIBRARIES = libboinc_zip.a
+lib_LIBRARIES = libboinc_zip.a

 libboinc_zip_a_SOURCES = boinc_zip.cpp \
 ./unzip/apihelp.c \
--- a/zip/configure.ac
+++ b/zip/configure.ac
@ -1,144 +0,0 @@
-dnl -*- autoconf -*-
-
-dnl $Id$
-
-dnl NOTE: on milkyway.ssl and jill.ssl , need autoconf/automake et al from quarl's
-dnl directory; the _autosetup script does this.
-
-dnl not sure exactly what the minimum version is (but 2.13 won't work)
-AC_PREREQ(2.57)
-
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(BOINC_ZIP, 1.00)
-
-echo "--- Configuring BOINC AC_PACKAGE_VERSION ---"
-
-AC_CANONICAL_SYSTEM
-
-dnl generate .tar.gz, .tar.bz2, .zip
-dnl AM_INIT_AUTOMAKE(dist-bzip2 dist-zip)
-AM_INIT_AUTOMAKE(dist-zip)
-
-## AC_CONFIG_SRCDIR(lib/shmem.C)
-
-AC_COPYRIGHT([
-The contents of this file are subject to the BOINC Public License
-Version 1.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://boinc.berkeley.edu/license_1.0.txt
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License. 
-
-The Original Code is the Berkeley Open Infrastructure for Network Computing. 
-
-The Initial Developer of the Original Code is the SETI@home project.
-Portions created by the SETI@home project are Copyright (C) 2002
-University of California at Berkeley. All Rights Reserved. 
-
-Contributor(s):  Carl Christensen
-])
-
-AC_REVISION([$Revision$])
-
-AC_SUBST(MAJOR_VERSION, `echo AC_PACKAGE_VERSION | sed 's/\..*//'`)
-AC_SUBST(MINOR_VERSION, `echo AC_PACKAGE_VERSION | sed 's/.*\.0*//'`)
-
-AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION, [Major part of version number])
-AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION, [Minor part of version number])
-AC_DEFINE_UNQUOTED(HOSTTYPE, "$host", [Host for this compilation])
-AC_SUBST(CLIENT_BIN_FILENAME,[boinc_]AC_PACKAGE_VERSION[_$host${EXEEXT}])
-AC_SUBST(TOP_BUILD_DIR, [`pwd`])
-AC_SUBST(TOP_SOURCE_DIR, [`(cd \`dirname "$0"\` && pwd)`])
-
-AM_MAINTAINER_MODE
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-dnl Checks for libraries.
-AC_CHECK_LIB(gen, main)
-AC_CHECK_LIB(m, sin)
-AC_CHECK_LIB(nsl, gethostbyaddr)
-AC_CHECK_LIB(socket, main)
-AC_CHECK_LIB(stdc++, main)
-AC_CHECK_LIB(z, gzopen)
-
-dnl Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_HEADER_TIME
-AC_CHECK_HEADERS(arpa/inet.h dirent.h fcntl.h malloc.h netdb.h netinet/in.h netinet/tcp.h signal.h strings.h sys/file.h sys/ipc.h sys/mount.h sys/resource.h sys/select.h sys/shm.h sys/socket.h sys/statvfs.h sys/statfs.h sys/swap.h sys/sysctl.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h errno.h)
-AC_LANG_PUSH(C++)
-AH_TEMPLATE([HAVE_STD_MIN],[Define to 1 if min is in namespace std::])
-AH_TEMPLATE([HAVE_STD_MAX],[Define to 1 if max is in namespace std::])
-AH_TEMPLATE([HAVE_STD_TRANSFORM],[Define to 1 if transform is in namespace std::
-])
-AC_LANG_POP
-dnl TODO: use compiler to test these; there probably exists an autoconf macro already!
-case "$target" in
-*-linux-* | *-sun-*)
-        AC_DEFINE(GETSOCKOPT_SOCKLEN_T, 1, [getsockopt uses socklen_t])
-        ;;
-*sysv5OpenUNIX8*)
-        AC_DEFINE(GETSOCKOPT_SIZE_T, 1, [getsockopt uses size_t])
-        ;;
-esac
-
-dnl Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_VPRINTF
-AC_FUNC_WAIT3
-AC_CHECK_FUNCS(gethostname gettimeofday mkdir select socket strstr uname lockf flock strftime setpriority wait4 strlcpy strlcat)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-AC_STRUCT_TIMEZONE
-
-# by default, create static binaries on linux.
-#[if [ "$target_os" = "linux-gnu" ]; then
-#    STATIC_FLAGS="-static"
-#fi
-#echo "checking static flags... ${STATIC_FLAGS:-(none)}"]
-#AC_SUBST(STATIC_FLAGS)
-
-AC_CONFIG_FILES([Makefile
-                 ])
-
-AC_CONFIG_HEADER([config.h])
-
-AC_OUTPUT
-
-echo "--- Configured BOINC AC_PACKAGE_VERSION ---"
-
-[
-true || $TOP_SOURCE_DIR/test/test_sanity.py || (
-    cat <<EOF
-
-******************************************************************************
-**  
-** The framework sanity check failed.
-**  
-** If you only want to compile (and run) the client or compile (and run) the
-** server, this may be okay.
-**  
-** If you are developing BOINC and want to run the automated tests, you need a
-** MySQL server installed and running, with permission to create databases.
-**
-** You can run this sanity check using test/test_sanity.py
-**
-******************************************************************************
-
-EOF
-
-)
-]