From: Steve M. <svn...@pl...> - 2008-06-29 01:19:49
|
Author: smcmahon Date: Sun Jun 29 01:19:56 2008 New Revision: 21302 Added: Installers/macosx/branches/osx-plus-buildout/scriptResources/dtest.py - copied, changed from r21300, Installers/macosx/branches/osx-plus-buildout/scriptResources/dtest.pl Installers/macosx/branches/osx-plus-buildout/scriptResources/mkinstance.py (contents, props changed) Removed: Installers/macosx/branches/osx-plus-buildout/scriptResources/cluster.sh Installers/macosx/branches/osx-plus-buildout/scriptResources/dtest.pl Installers/macosx/branches/osx-plus-buildout/scriptResources/standalone.sh Modified: Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/01standalone.xml Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/02zeo.xml Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/03standalone.xml Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/04zeo.xml Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/05startup.xml Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/06startup.xml Log: Consolidate to single instance script Modified: Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/01standalone.xml ============================================================================== --- Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/01standalone.xml (original) +++ Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/01standalone.xml Sun Jun 29 01:19:56 2008 @@ -1 +1 @@ -<pkgref spec="1.12" uuid="ECDA0957-0F1F-41AE-9B7D-E65E08350159"><config><identifier>org.plone.plone-3.1.1.zinstance_nr.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">zinstance_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preflight.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postflight.isRelativeType</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>installTo.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.pl</preflight><postinstall relative="true" mod="true">scriptResources/standalone.sh</postinstall><postupgrade relative="true" mod="true">scriptResources/standalone.sh</postupgrade></scripts><contents><file-list>01standalone-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="ECDA0957-0F1F-41AE-9B7D-E65E08350159"><config><identifier>org.plone.plone-3.1.1.zinstance_nr.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">zinstance_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preflight.isRelativeType</mod><mod>installTo</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installFrom.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>01standalone-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Modified: Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/02zeo.xml ============================================================================== --- Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/02zeo.xml (original) +++ Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/02zeo.xml Sun Jun 29 01:19:56 2008 @@ -1 +1 @@ -<pkgref spec="1.12" uuid="9C98F32C-3F51-496F-B525-EB5F44886546"><config><identifier>org.plone.plone-3.1.1.zeotemplate.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.scriptsDirectoryPath.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installTo</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.pl</preflight><postinstall relative="true" mod="true">scriptResources/cluster.sh</postinstall><postupgrade relative="true" mod="true">scriptResources/cluster.sh</postupgrade></scripts><contents><file-list>02zeo-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="9C98F32C-3F51-496F-B525-EB5F44886546"><config><identifier>org.plone.plone-3.1.1.zeotemplate.pkg</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_nr</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.postflight.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>requireAuthorization</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installTo.path</mod><mod>installTo</mod><mod>installFrom.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>02zeo-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Modified: Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/03standalone.xml ============================================================================== --- Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/03standalone.xml (original) +++ Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/03standalone.xml Sun Jun 29 01:19:56 2008 @@ -1 +1 @@ -<pkgref spec="1.12" uuid="1C36D0F1-B2F0-4AA9-B08A-B8C8605FA566"><config><identifier>org.plone.plone-3.1.1..standalone_root.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">zinstance_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installFrom.path</mod><mod>scripts.postflight.isRelativeType</mod><mod>installTo.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.pl</preflight><postinstall relative="true" mod="true">scriptResources/standalone.sh</postinstall><postupgrade relative="true" mod="true">scriptResources/standalone.sh</postupgrade></scripts><contents><file-list>03standalone-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="1C36D0F1-B2F0-4AA9-B08A-B8C8605FA566"><config><identifier>org.plone.plone-3.1.1..standalone_root.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/Standalone Zope</installFrom><installTo relative="true" mod="true" relocatable="true">zinstance_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.postflight.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>03standalone-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Modified: Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/04zeo.xml ============================================================================== --- Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/04zeo.xml (original) +++ Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/04zeo.xml Sun Jun 29 01:19:56 2008 @@ -1 +1 @@ -<pkgref spec="1.12" uuid="92F0145D-790E-437B-AD7D-051784260D9F"><config><identifier>org.plone.plone-3.1.1.zeoroot.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>scripts.postflight.isRelativeType</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.pl</preflight><postinstall relative="true" mod="true">scriptResources/cluster.sh</postinstall><postupgrade relative="true" mod="true">scriptResources/cluster.sh</postupgrade></scripts><contents><file-list>04zeo-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="92F0145D-790E-437B-AD7D-051784260D9F"><config><identifier>org.plone.plone-3.1.1.zeoroot.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">stubs/ZEO Cluster</installFrom><installTo relative="true" mod="true" relocatable="true">zeocluster_r</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>scripts.postupgrade.path</mod><mod>identifier</mod><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>scripts.postflight.path</mod><mod>scripts.preflight.path</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postflight.isRelativeType</mod><mod>installFrom.path</mod><mod>installTo.path</mod><mod>scripts.scriptsDirectoryPath.path</mod></config><scripts><preflight relative="true" mod="true">scriptResources/dtest.py</preflight><postinstall relative="true" mod="true">scriptResources/mkinstance.py</postinstall><postupgrade relative="true" mod="true">scriptResources/mkinstance.py</postupgrade></scripts><contents><file-list>04zeo-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Modified: Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/05startup.xml ============================================================================== --- Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/05startup.xml (original) +++ Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/05startup.xml Sun Jun 29 01:19:56 2008 @@ -1 +1 @@ -<pkgref spec="1.12" uuid="F99F5374-585A-48AC-AD03-6CC955DA8AAD"><config><identifier>org.plone.plone-3.1.1.initscripts.plonestandalone.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">stubs/Startup Item</installFrom><installTo relative="true" mod="true" relocatable="true">standalone_startup</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installTo</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>includeRoot</mod><mod>identifier</mod></config><contents><file-list>05startup-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="F99F5374-585A-48AC-AD03-6CC955DA8AAD"><config><identifier>org.plone.plone-3.1.1.initscripts.plonestandalone.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">stubs/Startup Item</installFrom><installTo relative="true" mod="true" relocatable="true">standalone_startup</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>includeRoot</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>identifier</mod><mod>installTo</mod></config><contents><file-list>05startup-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Modified: Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/06startup.xml ============================================================================== --- Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/06startup.xml (original) +++ Installers/macosx/branches/osx-plus-buildout/Plone.pmdoc/06startup.xml Sun Jun 29 01:19:56 2008 @@ -1 +1 @@ -<pkgref spec="1.12" uuid="3EC99518-0B13-465F-80FE-105864944C3A"><config><identifier>org.plone.plone-3.1.1.initscripts.plonecluster.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">stubs/Startup Item</installFrom><installTo relative="true" mod="true" relocatable="true">cluster_startup</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>identifier</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>includeRoot</mod><mod>installTo</mod></config><contents><file-list>06startup-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="3EC99518-0B13-465F-80FE-105864944C3A"><config><identifier>org.plone.plone-3.1.1.initscripts.plonecluster.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">stubs/Startup Item</installFrom><installTo relative="true" mod="true" relocatable="true">cluster_startup</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>includeRoot</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>06startup-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Copied: Installers/macosx/branches/osx-plus-buildout/scriptResources/dtest.py (from r21300, Installers/macosx/branches/osx-plus-buildout/scriptResources/dtest.pl) ============================================================================== --- Installers/macosx/branches/osx-plus-buildout/scriptResources/dtest.pl (original) +++ Installers/macosx/branches/osx-plus-buildout/scriptResources/dtest.py Sun Jun 29 01:19:56 2008 @@ -11,7 +11,9 @@ # $1 is package path # $2 is install path PACKAGE_PATH = sys.argv[1] +print "PACKAGE_PATH: %s" % PACKAGE_PATH PLONE_HOME = sys.argv[2] +print "PLONE_HOME: %s" % PLONE_HOME if os.path.exists(PLONE_HOME) and \ not os.access(PLONE_HOME, os.W_OK | os.X_OK): @@ -22,12 +24,10 @@ exit(1) -if PACKAGE_PATH.find('standaloneZope.pkg') or \ - PACKAGE_PATH.find('standaloneZope-1.pkg'): +if PACKAGE_PATH.endswith(('standaloneZope.pkg', 'standaloneZope-1.pkg',)): installMode = 'standalone' destination = os.path.join(PLONE_HOME, 'zinstance') -elif PACKAGE_PATH.find('zeoCluster.pkg') or \ - PACKAGE_PATH.find('zeoCluster-1.pkg'): +elif PACKAGE_PATH.endswith(('zeoCluster.pkg', 'zeoCluster-1.pkg',)): installMode = 'zeo' destination = os.path.join(PLONE_HOME, 'zeocluster') @@ -36,4 +36,4 @@ """Installation Aborted: %s already exists.""" % destination ) - exit(1) \ No newline at end of file + sys.exit(1) \ No newline at end of file Added: Installers/macosx/branches/osx-plus-buildout/scriptResources/mkinstance.py ============================================================================== --- (empty file) +++ Installers/macosx/branches/osx-plus-buildout/scriptResources/mkinstance.py Sun Jun 29 01:19:56 2008 @@ -0,0 +1,48 @@ +#!/usr/bin/python + +import sys, os, os.path + +PACKAGE_PATH = sys.argv[1] +PLONE_HOME = sys.argv[2] + +# Figure out whether we're installing a stand-alone +# or cluster instance. Remove installer stub. +if PACKAGE_PATH.endswith(('standaloneZope.pkg', 'standaloneZope-1.pkg',)): + installMode = 'standalone' + os.remove(os.path.join(PLONE_HOME,'Standalone Zope')) +elif PACKAGE_PATH.endswith(('zeoCluster.pkg', 'zeoCluster-1.pkg',)): + installMode = 'zeo' + os.remove(os.path.join(PLONE_HOME,'ZEO Cluster')) + +# Find Base Resources directory +BASE_RESOURCES = os.path.normpath( + os.path.join(PACKAGE_PATH, '../pythonZopePloneBase.pkg/Contents/Resources') + ) + +print "PACKAGE_PATH: %s" % PACKAGE_PATH +print "PLONE_HOME: %s" % PLONE_HOME +print "BASE_RESOURCES: %s" % BASE_RESOURCES + +# ownership fixup, if necessary +if os.geteuid() == 0: + egid = os.getegid() + print "Root installed detected; fixing base component ownership." + status = os.system( 'chown root:admin %s' % PLONE_HOME ) + if status: + exit(status) + status = os.system( +""" + chown -R root:admin %s/Python* \ + %s/buildout-cache \ + %s/Zope* +""" % (PLONE_HOME, PLONE_HOME, PLONE_HOME) + ) + if status: + exit(status) + +# change to unified installer's directory and run it +os.chdir( os.path.join(BASE_RESOURCES, 'UnifiedInstaller') ) +command = "./install.sh %s --separate-zope --skip-tool-tests --libjpeg=no --libz=no --target=%s" % \ + (installMode, PLONE_HOME) +print command +exit(os.system(command)) \ No newline at end of file |