more work on osx packaging

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1058 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/GNUmakefile b/GNUmakefile
index b54e606689ca18c6f98e62071319a75630e5e81f..96457e0e7a06ddc3213f03eb932e23894fb89e44 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -24,6 +24,12 @@ ifeq ($(HAS_LIBRARY_ldap),yes)
 SUBPROJECTS += sope-ldap
 endif
 
+ifeq ($(FOUNDATION_LIB),apple)
+ifeq ($(frameworks),yes)
+SUBPROJECTS += sopex
+endif
+endif
+
 
 -include $(GNUSTEP_MAKEFILES)/GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/aggregate.make
@@ -36,3 +42,8 @@ distclean ::
        if test -d .gsmake; then rm -r .gsmake; fi
        if test -f config-NGStreams.log; then rm config-NGStreams.log; fi
        if test -f config-gstepmake.log; then rm config-gstepmake.log; fi
+
+macosx-pkg ::
+       for i in $(SUBPROJECTS); do \
+         (cd $$i; $(MAKE) macosx-pkg); \
+       done
\ No newline at end of file

diff --git a/maintenance/make-osxpkg.sh b/maintenance/make-osxpkg.sh
index 460c687e0f20b61f4678f916662d9466a0c7454d..23c4d324c473feba1149197693cd86d1c046d8ab 100755 (executable)
--- a/maintenance/make-osxpkg.sh
+++ b/maintenance/make-osxpkg.sh
@@ -350,11 +350,26 @@ function debugShowResults() {
 }
 
 
+# ****************************** sudo *********************************
+
+function ensureSudo() {
+  # this will bring up the 'sudo' authentication
+  if test "x$USER" != "xroot"; then
+    echo "We need to run some commands using 'sudo', so please enter your "
+    echo "credentials when being asked for them (unless you already did so)"
+    sudo touch /tmp/osx-pkg-sudo-tmp
+    sudo rm    /tmp/osx-pkg-sudo-tmp
+  fi
+}
+
+
 # ****************************** running ******************************
 
 echo "Building MacOSX Installer.app package $PKG_NAME.pkg .."
 validateArgs;
 
+ensureSudo;
+
 prepareTmpDirs;
 installIntoTmpDirs;
 fixUpPermissions;
@@ -380,4 +395,15 @@ copyWelcomeFile;
 # debugging, print results
 #debugShowResults;
 
+
+# move results
+if test -d "$PKG_DIR"; then
+  if test -d "${oldpwd}/${PKG_NAME}.pkg"; then
+    rm -rf "${oldpwd}/${PKG_NAME}.pkg"
+  fi
+  mv "$PKG_DIR" "${oldpwd}/${PKG_NAME}.pkg"
+else
+  echo "ERROR: did not find package: $PKG_DIR"
+fi
+
 #cleanupTmpDirs;

diff --git a/sope-appserver/GNUmakefile b/sope-appserver/GNUmakefile
index ae522322cf8ee2ff9247c36f91632fe53b19a7db..72af647de2acc7f1eb0ae1026a0a71f1a54313cf 100644 (file)
--- a/sope-appserver/GNUmakefile
+++ b/sope-appserver/GNUmakefile
@@ -32,3 +32,9 @@ include $(GNUSTEP_MAKEFILES)/framework.make
 endif
 
 -include $(GNUSTEP_MAKEFILES)/GNUmakefile.postamble
+
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh sope-appserver

diff --git a/sope-core/GNUmakefile b/sope-core/GNUmakefile
index 7f1da912d0e5fa133d0ef72556b31b57f9309505..006921c39f3c78cdba71d467a0d0200dd8afb5ad 100644 (file)
--- a/sope-core/GNUmakefile
+++ b/sope-core/GNUmakefile
@@ -27,3 +27,9 @@ include $(GNUSTEP_MAKEFILES)/aggregate.make
 ifeq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
+
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh sope-core

diff --git a/sope-gdl1/GNUmakefile b/sope-gdl1/GNUmakefile
index dee50979b39fd2394e25693f78b649f1cb02b816..3337597f3617e3a582bd08a002f0c00d4df2760d 100644 (file)
--- a/sope-gdl1/GNUmakefile
+++ b/sope-gdl1/GNUmakefile
@@ -25,3 +25,9 @@ endif
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 -include GNUmakefile.postamble
+
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh sope-gdl1

diff --git a/sope-ical/GNUmakefile b/sope-ical/GNUmakefile
index 4c4c4ccd8d4e513e7c941b39e492e6fb53771c62..088cdd26a2ceb347576c868574fd9c9735b9481d 100644 (file)
--- a/sope-ical/GNUmakefile
+++ b/sope-ical/GNUmakefile
@@ -15,3 +15,9 @@ SUBPROJECTS += iCalSaxDriver
 endif
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make
+
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh sope-ical

diff --git a/sope-ldap/GNUmakefile b/sope-ldap/GNUmakefile
index 1f99d149c65bdeca0df89b0c4efa07b8472b1083..a78d86fb78f56dec6efe0ab35f5e290aa64da8c3 100644 (file)
--- a/sope-ldap/GNUmakefile
+++ b/sope-ldap/GNUmakefile
@@ -11,3 +11,9 @@ SUBPROJECTS = \
        samples
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make
+
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh sope-ldap

diff --git a/sope-mime/GNUmakefile b/sope-mime/GNUmakefile
index 48c792b677533a93a725688455589f3ad048bbd1..1158f5b5b8c53aa5557435d835b26e827c9e084b 100644 (file)
--- a/sope-mime/GNUmakefile
+++ b/sope-mime/GNUmakefile
@@ -43,3 +43,9 @@ include $(GNUSTEP_MAKEFILES)/aggregate.make
 endif
 -include GNUmakefile.postamble
 -include fhs.make
+
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh sope-mime

diff --git a/sope-xml/DOM/GNUmakefile b/sope-xml/DOM/GNUmakefile
index 2b296ce5c86e30dce731f48e9c365056301204b5..6a9b051823bbdb5223506bb80d3e18f57bd6bb11 100644 (file)
--- a/sope-xml/DOM/GNUmakefile
+++ b/sope-xml/DOM/GNUmakefile
@@ -9,11 +9,6 @@ else
 FRAMEWORK_NAME = DOM
 endif
 
-libDOM_HEADER_FILES_DIR         = .
-libDOM_HEADER_FILES_INSTALL_DIR = /DOM
-libDOM_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libDOM_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
-
 LDOM_HEADER_FILES += \
        DOM.h                           \
        DOMProtocols.h                  \
@@ -95,10 +90,6 @@ libDOM_OBJC_FILES = \
        $(DOM_CORE_OBJC_FILES)          \
        $(DOM_TRAVERSAL_OBJC_FILES)     \
 
-# framework support
-DOM_HEADER_FILES = $(libDOM_HEADER_FILES)
-DOM_OBJC_FILES   = $(libDOM_OBJC_FILES)
-
 
 # building
 

diff --git a/sope-xml/DOM/GNUmakefile.preamble b/sope-xml/DOM/GNUmakefile.preamble
index 9342d2a5a9c21c541ae453dd7fea37b2cb940cb7..72ef7c2bbd59b3a459a51ee5a662c3aeb2feeb3b 100644 (file)
--- a/sope-xml/DOM/GNUmakefile.preamble
+++ b/sope-xml/DOM/GNUmakefile.preamble
@@ -1,5 +1,18 @@
 # compilation settings
 
+libDOM_HEADER_FILES_DIR         = .
+libDOM_HEADER_FILES_INSTALL_DIR = /DOM
+libDOM_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libDOM_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+DOM_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+DOM_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+
+
+# framework support
+DOM_HEADER_FILES = $(libDOM_HEADER_FILES)
+DOM_OBJC_FILES   = $(libDOM_OBJC_FILES)
+
+
 ADDITIONAL_INCLUDE_DIRS += -I.. -I../..
 
 libDOM_LIBRARIES_DEPEND_UPON += -lSaxObjC

diff --git a/sope-xml/GNUmakefile b/sope-xml/GNUmakefile
index a8b58be58b8b005c2f8781fd6d195d5e5dd0a690..11c6f2a9d5199a70ea0ba27605d682c2084b4590 100644 (file)
--- a/sope-xml/GNUmakefile
+++ b/sope-xml/GNUmakefile
@@ -29,3 +29,9 @@ include $(GNUSTEP_MAKEFILES)/aggregate.make
 ifeq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/framework.make
 endif
+
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh sope-xml

diff --git a/sope-xml/SaxObjC/GNUmakefile b/sope-xml/SaxObjC/GNUmakefile
index 49a5300717ac265d26328ad4be930f1a08eae487..b3f04b399e083c581e231b38443222d4064cecd8 100644 (file)
--- a/sope-xml/SaxObjC/GNUmakefile
+++ b/sope-xml/SaxObjC/GNUmakefile
@@ -9,13 +9,6 @@ else
 FRAMEWORK_NAME = SaxObjC
 endif
 
-libSaxObjC_DLL_DEF      = libSaxObjC.def
-libSaxObjC_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libSaxObjC_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
-
-libSaxObjC_HEADER_FILES_DIR         = .
-libSaxObjC_HEADER_FILES_INSTALL_DIR = /SaxObjC
-
 libSaxObjC_OBJC_FILES = \
        SaxAttributeList.m              \
        SaxAttributes.m                 \
@@ -54,10 +47,6 @@ libSaxObjC_HEADER_FILES = \
        SaxMethodCallHandler.h          \
        XMLNamespaces.h                 \
 
-# framework support
-SaxObjC_HEADER_FILES = $(libSaxObjC_HEADER_FILES)
-SaxObjC_OBJC_FILES   = $(libSaxObjC_OBJC_FILES)
-
 
 # building
 

diff --git a/sope-xml/SaxObjC/GNUmakefile.preamble b/sope-xml/SaxObjC/GNUmakefile.preamble
index 2db2bdde043c68ccc56b86ce8731e75ddb6d4c9b..38cb639dde17c925b03470918573f333e461fa20 100644 (file)
--- a/sope-xml/SaxObjC/GNUmakefile.preamble
+++ b/sope-xml/SaxObjC/GNUmakefile.preamble
@@ -1,5 +1,19 @@
 # compilation settings
 
+libSaxObjC_DLL_DEF      = libSaxObjC.def
+libSaxObjC_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libSaxObjC_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+SaxObjC_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+SaxObjC_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+
+libSaxObjC_HEADER_FILES_DIR         = .
+libSaxObjC_HEADER_FILES_INSTALL_DIR = /SaxObjC
+
+# framework support
+SaxObjC_HEADER_FILES = $(libSaxObjC_HEADER_FILES)
+SaxObjC_OBJC_FILES   = $(libSaxObjC_OBJC_FILES)
+
+
 ADDITIONAL_CPPFLAGS += \
         -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
         -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION)   \

diff --git a/sope-xml/XmlRpc/GNUmakefile b/sope-xml/XmlRpc/GNUmakefile
index e623ec3c632e12ab1af71e3fac4bfb59cc1f8eea..8698b9ef7276dbe56f713c673fc99c6d3b40fd42 100644 (file)
--- a/sope-xml/XmlRpc/GNUmakefile
+++ b/sope-xml/XmlRpc/GNUmakefile
@@ -9,11 +9,6 @@ else
 FRAMEWORK_NAME = XmlRpc
 endif
 
-libXmlRpc_HEADER_FILES_DIR         = .
-libXmlRpc_HEADER_FILES_INSTALL_DIR = /XmlRpc
-libXmlRpc_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-libXmlRpc_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
-
 libXmlRpc_HEADER_FILES = \
        XmlRpc.h                        \
        NSObject+XmlRpc.h               \
@@ -42,10 +37,6 @@ libXmlRpc_OBJC_FILES = \
        NSString+XmlRpcCoding.m         \
        NSURL+XmlRpcCoding.m            \
 
-# framework support
-XmlRpc_HEADER_FILES = $(libXmlRpc_HEADER_FILES)
-XmlRpc_OBJC_FILES   = $(libXmlRpc_OBJC_FILES)
-
 
 -include GNUmakefile.preamble
 ifneq ($(frameworks),yes)

diff --git a/sope-xml/XmlRpc/GNUmakefile.preamble b/sope-xml/XmlRpc/GNUmakefile.preamble
index 6c94d0afd7116006865e54fd67612f6d8fc89f0c..95fb508459f4868dcf221684afee39e79f6b7010 100644 (file)
--- a/sope-xml/XmlRpc/GNUmakefile.preamble
+++ b/sope-xml/XmlRpc/GNUmakefile.preamble
@@ -1,5 +1,18 @@
 # compilation settings
 
+libXmlRpc_HEADER_FILES_DIR         = .
+libXmlRpc_HEADER_FILES_INSTALL_DIR = /XmlRpc
+libXmlRpc_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libXmlRpc_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+XmlRpc_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+XmlRpc_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
+
+
+# framework support
+XmlRpc_HEADER_FILES = $(libXmlRpc_HEADER_FILES)
+XmlRpc_OBJC_FILES   = $(libXmlRpc_OBJC_FILES)
+
+
 libXmlRpc_LIBRARIES_DEPEND_UPON += -lSaxObjC -lDOM
 
 ifneq ($(GNUSTEP_BUILD_DIR),)

diff --git a/sopex/GNUmakefile b/sopex/GNUmakefile
index 97b0ca8c002c33bb6999e0ff20096b49e161cb90..03a066e36100d375484b0170aaa6c91163f897d1 100644 (file)
--- a/sopex/GNUmakefile
+++ b/sopex/GNUmakefile
@@ -11,5 +11,11 @@ SUBPROJECTS += \
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 
+
+# package
+
+macosx-pkg :: all
+       ../maintenance/make-osxpkg.sh "SOPE:X"
+
 endif
 endif