Browse files

Update installer to remove support for OS X Controller; Fixes #13025

  • Loading branch information...
1 parent 6ec2c21 commit 5ed60267153b51c777c5933e1649ea22401fbf5c @smcmahon smcmahon committed Jul 8, 2012
Showing with 10 additions and 22 deletions.
  1. +5 −0 HISTORY.txt
  2. +3 −7 buildout_templates/base.cfg
  3. +2 −15 helper_scripts/create_instance.py
View
5 HISTORY.txt 100644 → 100755
@@ -1,3 +1,8 @@
+4.2 installer update - 2012-07-08
+
+ - Remove osxcontroller support. This only worked on OS X 10.5 & 10.6, which
+ have been out-of-date for over a year.
+
4.2 - 2012-07-02
- Adapt to 4.2.
View
10 buildout_templates/base.cfg 100644 → 100755
@@ -34,7 +34,7 @@ unzip = true
# Load the DumpPickedVersions extension, which will notify
# you of versions picked by buildout that were not specifically
-# pinned.
+# pinned.
extensions = buildout.dumppickedversions
@@ -103,7 +103,7 @@ update-command = ${chown:command}
recipe = plone.recipe.unifiedinstaller
user = ${buildout:user}
primary-port = ${buildout:http-address}
-sudo-command =
+sudo-command =
[repozo]
@@ -150,10 +150,6 @@ command =
update-command = ${chown-zeo:command}
-[osxcontroller]
-recipe=plone.recipe.osxcontroller
-
-
[zopeskel]
# installs paster and Zopeskel
recipe = zc.recipe.egg
@@ -200,7 +196,7 @@ eggs = ${buildout:eggs}
# If you want to register ZCML slugs for any packages, list them here.
# e.g. zcml = my.package my.other.package
zcml = ${buildout:zcml}
-
+
products = ${buildout:directory}/products
# You may also control the environment variables for the instance.
View
17 helper_scripts/create_instance.py 100644 → 100755
@@ -140,18 +140,8 @@ def doCommand(command):
buildout = fd.read()
fd.close()
-# if standalone, non-root & OS X Leopard or Snow Leopard, install controller
-if (ITYPE == 'standalone') and \
- (ROOT_INSTALL != '1') and \
- (platform.system() == 'Darwin') and \
- (int(platform.platform().split('-')[1].split('.')[0]) in (9, 10)):
- # add to parts
- buildout = buildout.replace('parts =\n', 'parts =\n osxcontroller')
- wantOSX = True
-else:
- wantOSX = False
- buildout = buildout.replace('client1', client_list)
- buildout = buildout.replace('# Additional clients:', client_addresses)
+buildout = buildout.replace('client1', client_list)
+buildout = buildout.replace('# Additional clients:', client_addresses)
# set password
@@ -219,9 +209,6 @@ def doCommand(command):
del buildout['instance']
del buildout['chown']
-if not wantOSX:
- del buildout['osxcontroller']
-
fn = os.path.join(INSTANCE_HOME, 'base.cfg')
fd = file(fn, 'w')
fd.write(str(buildout))

0 comments on commit 5ed6026

Please sign in to comment.