Commit 12cb99b3 authored by Jack Jansen's avatar Jack Jansen

Various tweaks to make the packages work better. Still not 100%, though.

parent f7538163
...@@ -60,7 +60,6 @@ Title ...@@ -60,7 +60,6 @@ Title
Version Version
Description Description
DefaultLocation DefaultLocation
Diskname
DeleteWarning DeleteWarning
NeedsAuthorization NeedsAuthorization
DisableStop DisableStop
...@@ -71,6 +70,10 @@ Required ...@@ -71,6 +70,10 @@ Required
InstallOnly InstallOnly
RequiresReboot RequiresReboot
RootVolumeOnly RootVolumeOnly
LongFilenames
LibrarySubdirectory
AllowBackRev
OverwritePermissions
InstallFat\ InstallFat\
""" """
...@@ -138,7 +141,6 @@ class PackageMaker: ...@@ -138,7 +141,6 @@ class PackageMaker:
'Version': None, 'Version': None,
'Description': '', 'Description': '',
'DefaultLocation': '/', 'DefaultLocation': '/',
'Diskname': '(null)',
'DeleteWarning': '', 'DeleteWarning': '',
'NeedsAuthorization': 'NO', 'NeedsAuthorization': 'NO',
'DisableStop': 'NO', 'DisableStop': 'NO',
...@@ -149,7 +151,12 @@ class PackageMaker: ...@@ -149,7 +151,12 @@ class PackageMaker:
'InstallOnly': 'NO', 'InstallOnly': 'NO',
'RequiresReboot': 'NO', 'RequiresReboot': 'NO',
'RootVolumeOnly' : 'NO', 'RootVolumeOnly' : 'NO',
'InstallFat': 'NO'} 'InstallFat': 'NO',
'LongFilenames': 'YES',
'LibrarySubdirectory': 'Standard',
'AllowBackRev': 'YES',
'OverwritePermissions': 'NO',
}
def __init__(self, title, version, desc): def __init__(self, title, version, desc):
...@@ -201,6 +208,7 @@ class PackageMaker: ...@@ -201,6 +208,7 @@ class PackageMaker:
self._addArchive() self._addArchive()
self._addResources() self._addResources()
self._addSizes() self._addSizes()
self._addLoc()
def _makeFolders(self): def _makeFolders(self):
...@@ -223,7 +231,8 @@ class PackageMaker: ...@@ -223,7 +231,8 @@ class PackageMaker:
info = "" info = ""
for f in string.split(PKG_INFO_FIELDS, "\n"): for f in string.split(PKG_INFO_FIELDS, "\n"):
info = info + "%s %%(%s)s\n" % (f, f) if self.packageInfo.has_key(f):
info = info + "%s %%(%s)s\n" % (f, f)
info = info % self.packageInfo info = info % self.packageInfo
base = self.packageInfo["Title"] + ".info" base = self.packageInfo["Title"] + ".info"
path = join(self.packageResourceFolder, base) path = join(self.packageResourceFolder, base)
...@@ -351,6 +360,11 @@ class PackageMaker: ...@@ -351,6 +360,11 @@ class PackageMaker:
format = "NumFiles %d\nInstalledSize %d\nCompressedSize %d\n" format = "NumFiles %d\nInstalledSize %d\nCompressedSize %d\n"
f.write(format % (numFiles, installedSize, zippedSize)) f.write(format % (numFiles, installedSize, zippedSize))
def _addLoc(self):
"Write .loc file."
base = self.packageInfo["Title"] + ".loc"
f = open(join(self.packageResourceFolder, base), "w")
f.write('/')
# Shortcut function interface # Shortcut function interface
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment