[Zope-CVS] CVS: Packages/WinBuilders/bin - decompilezpy.py:1.2
fixreg.py:1.2 makezope.bat:1.2 runzeo.bat:1.2
Tim Peters
tim.one at comcast.net
Sun Jan 25 23:14:01 EST 2004
Update of /cvs-repository/Packages/WinBuilders/bin
In directory cvs.zope.org:/tmp/cvs-serv13324/bin
Modified Files:
decompilezpy.py fixreg.py makezope.bat runzeo.bat
Log Message:
Most of the text files here had \r\n line ends checked in to the CVS
repository, so on checkout you got \r\n line ends on Linux and \r\r\n
line ends on Windows. This just replaces the line ends so that they're
"normal" for text files.
=== Packages/WinBuilders/bin/decompilezpy.py 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/bin/decompilezpy.py:1.1.1.1 Tue Aug 12 15:16:37 2003
+++ Packages/WinBuilders/bin/decompilezpy.py Sun Jan 25 23:13:30 2004
@@ -1,28 +1,28 @@
-#!/usr/bin/env python
-##############################################################################
-#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-import os
-import sys
-
-def main(dirname):
- os.path.walk(dirname, rmpycs, None)
-
-def rmpycs(arg, dirname, names):
- for name in names:
- path = os.path.join(dirname, name)
- if ( name.endswith('.pyc') or name.endswith('.pyo') and
- os.path.isfile(path) ):
- os.unlink(path)
-
-if __name__ == '__main__':
- main(sys.argv[1])
+#!/usr/bin/env python
+##############################################################################
+#
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE
+#
+##############################################################################
+import os
+import sys
+
+def main(dirname):
+ os.path.walk(dirname, rmpycs, None)
+
+def rmpycs(arg, dirname, names):
+ for name in names:
+ path = os.path.join(dirname, name)
+ if ( name.endswith('.pyc') or name.endswith('.pyo') and
+ os.path.isfile(path) ):
+ os.unlink(path)
+
+if __name__ == '__main__':
+ main(sys.argv[1])
=== Packages/WinBuilders/bin/fixreg.py 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/bin/fixreg.py:1.1.1.1 Fri Aug 15 18:03:25 2003
+++ Packages/WinBuilders/bin/fixreg.py Sun Jan 25 23:13:30 2004
@@ -1,73 +1,73 @@
-""" Fix up registry entries on Zope uninstall """
-from _winreg import *
-import sys
-
-def manageZopeRegEntries(uninstalling):
- """ Called at uninstall time from innosetup installer to
- manage the 'current' and 'previous' Zope versions. This is
- just a convenience to make the Pascal coding in innosetup a little
- less baroque """
-
- prefix = 'Software\\Zope Corporation'
-
- try:
- zope = openKeyAllAccess(HKEY_LOCAL_MACHINE, '%s\\Zope\\' % prefix)
- except EnvironmentError:
- # this should never happen (the key is created by ISS)
- return
-
- try:
- current = QueryValueEx(zope, 'CurrentVersion')[0]
- except WindowsError:
- current = uninstalling
- try:
- previous = QueryValueEx(zope, 'PreviousVersion')[0]
- except WindowsError:
- previous = uninstalling
-
- if current != uninstalling:
- # someone installed on top of us, punt
- CloseKey(zope)
- return
-
- # make the previous known version into the current version if it still
- # exists
- try:
- old = openKeyAllAccess(zope, previous)
- except (WindowsError, EnvironmentError):
- pass
- else:
- CloseKey(old)
- SetValueEx(zope, 'CurrentVersion', None, REG_SZ, previous)
-
- recurseDelete(HKEY_LOCAL_MACHINE, '%s\\Zope\\%s' % (prefix, uninstalling))
- recurseDelete(HKEY_LOCAL_MACHINE, '%s\\Zope\\' % prefix)
- recurseDelete(HKEY_LOCAL_MACHINE, prefix)
-
-def openKeyAllAccess(key, subkey):
- return OpenKey(key, subkey, 0, KEY_ALL_ACCESS)
-
-def recurseDelete(key, subkey):
- """ Delete all keys in subkey that are empty, recursively """
- names = filter(None, subkey.split('\\'))
- done = []
- keys = []
- while names:
- name = names.pop(0)
- done.append(name)
- keyname = '\\'.join(done)
- thiskey = openKeyAllAccess(key, keyname)
- keys.append(thiskey)
- try:
- EnumKey(thiskey, 0)
- except:
- # no subkeys, ok to delete
- DeleteKey(key, keyname)
-
- for openkey in keys:
- CloseKey(openkey)
-
-if __name__ == '__main__':
- manageZopeRegEntries(sys.argv[1])
-
-
+""" Fix up registry entries on Zope uninstall """
+from _winreg import *
+import sys
+
+def manageZopeRegEntries(uninstalling):
+ """ Called at uninstall time from innosetup installer to
+ manage the 'current' and 'previous' Zope versions. This is
+ just a convenience to make the Pascal coding in innosetup a little
+ less baroque """
+
+ prefix = 'Software\\Zope Corporation'
+
+ try:
+ zope = openKeyAllAccess(HKEY_LOCAL_MACHINE, '%s\\Zope\\' % prefix)
+ except EnvironmentError:
+ # this should never happen (the key is created by ISS)
+ return
+
+ try:
+ current = QueryValueEx(zope, 'CurrentVersion')[0]
+ except WindowsError:
+ current = uninstalling
+ try:
+ previous = QueryValueEx(zope, 'PreviousVersion')[0]
+ except WindowsError:
+ previous = uninstalling
+
+ if current != uninstalling:
+ # someone installed on top of us, punt
+ CloseKey(zope)
+ return
+
+ # make the previous known version into the current version if it still
+ # exists
+ try:
+ old = openKeyAllAccess(zope, previous)
+ except (WindowsError, EnvironmentError):
+ pass
+ else:
+ CloseKey(old)
+ SetValueEx(zope, 'CurrentVersion', None, REG_SZ, previous)
+
+ recurseDelete(HKEY_LOCAL_MACHINE, '%s\\Zope\\%s' % (prefix, uninstalling))
+ recurseDelete(HKEY_LOCAL_MACHINE, '%s\\Zope\\' % prefix)
+ recurseDelete(HKEY_LOCAL_MACHINE, prefix)
+
+def openKeyAllAccess(key, subkey):
+ return OpenKey(key, subkey, 0, KEY_ALL_ACCESS)
+
+def recurseDelete(key, subkey):
+ """ Delete all keys in subkey that are empty, recursively """
+ names = filter(None, subkey.split('\\'))
+ done = []
+ keys = []
+ while names:
+ name = names.pop(0)
+ done.append(name)
+ keyname = '\\'.join(done)
+ thiskey = openKeyAllAccess(key, keyname)
+ keys.append(thiskey)
+ try:
+ EnumKey(thiskey, 0)
+ except:
+ # no subkeys, ok to delete
+ DeleteKey(key, keyname)
+
+ for openkey in keys:
+ CloseKey(openkey)
+
+if __name__ == '__main__':
+ manageZopeRegEntries(sys.argv[1])
+
+
=== Packages/WinBuilders/bin/makezope.bat 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/bin/makezope.bat:1.1.1.1 Fri Aug 15 21:29:25 2003
+++ Packages/WinBuilders/bin/makezope.bat Sun Jan 25 23:13:30 2004
@@ -1,4 +1,4 @@
-cd %1%
-set MAKEFLAGS=
-nmake build
-nmake install
+cd %1%
+set MAKEFLAGS=
+nmake build
+nmake install
=== Packages/WinBuilders/bin/runzeo.bat 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/bin/runzeo.bat:1.1.1.1 Tue Aug 12 15:20:31 2003
+++ Packages/WinBuilders/bin/runzeo.bat Sun Jan 25 23:13:30 2004
@@ -1,7 +1,7 @@
- at set PYTHON=C:\Program Files\Zope-2.7.0-b1+\bin\python.exe
- at set ZOPE_HOME=C:\Program Files\Zope-2.7.0-b1+\lib\python
- at set INSTANCE_HOME=C:\ZEO-Instance
- at set CONFIG_FILE=%INSTANCE_HOME%\etc\zeo.conf
- at set PYTHONPATH=%ZOPE_HOME%
- at set ZEO_RUN=%ZOPE_HOME%\ZEO\runzeo.py
-"%PYTHON%" "%ZEO_RUN%" -C "%CONFIG_FILE%" %1 %2 %3 %4 %5
+ at set PYTHON=C:\Program Files\Zope-2.7.0-b1+\bin\python.exe
+ at set ZOPE_HOME=C:\Program Files\Zope-2.7.0-b1+\lib\python
+ at set INSTANCE_HOME=C:\ZEO-Instance
+ at set CONFIG_FILE=%INSTANCE_HOME%\etc\zeo.conf
+ at set PYTHONPATH=%ZOPE_HOME%
+ at set ZEO_RUN=%ZOPE_HOME%\ZEO\runzeo.py
+"%PYTHON%" "%ZEO_RUN%" -C "%CONFIG_FILE%" %1 %2 %3 %4 %5
More information about the Zope-CVS
mailing list