From: helge Date: Sun, 21 Aug 2005 21:51:09 +0000 (+0000) Subject: more work on osx packaging X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea91486bca30af1015a4457cabef1ed1f1dadb93;p=sope 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 b54e6066..96457e0e 100644 --- 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 460c687e..23c4d324 100755 --- 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 ae522322..72af647d 100644 --- 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 7f1da912..006921c3 100644 --- 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 dee50979..3337597f 100644 --- 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 4c4c4ccd..088cdd26 100644 --- 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 1f99d149..a78d86fb 100644 --- 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 48c792b6..1158f5b5 100644 --- 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 2b296ce5..6a9b0518 100644 --- 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 9342d2a5..72ef7c2b 100644 --- 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 a8b58be5..11c6f2a9 100644 --- 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 49a53007..b3f04b39 100644 --- 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 2db2bdde..38cb639d 100644 --- 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 e623ec3c..8698b9ef 100644 --- 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 6c94d0af..95fb5084 100644 --- 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 97b0ca8c..03a066e3 100644 --- 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