Changeset 711:7eae2cba8191

Timestamp:

12/24/08 13:52:56 (3 years ago)

Author:

mitsuhiko

Branch:

default

Message:

New installer for POSIX

Files:

• Makefile.in (modified) (1 diff)
• scripts/_install-posix.py (added)
• scripts/_uninstall-posix.sh (moved) (moved from scripts/uninstall-posix) (1 prop)
• scripts/create-package (modified) (6 diffs)
• scripts/install-posix (deleted)

Makefile.in

@@ -8 +8 @@
 
 install:
-        @(PREFIX=$(PREFIX) PYTHON=$(PYTHON) ./scripts/install-posix)
+        @($(PYTHON) scripts/install-posix $(PREFIX))
 
 uninstall:
-        @(PREFIX=$(PREFIX) ./scripts/uninstall-posix)
+        @(PREFIX=$(PREFIX) /bin/sh ./scripts/_uninstall-posix.sh)

scripts/create-package

@@ -40 +40 @@
 
 
-def find_files():
+def find_files(force):
     allowed_states = frozenset('CI?')
     client = subprocess.Popen(['hg', 'status', '-A'], stdout=subprocess.PIPE)
@@ -48 +48 @@
             continue
         status, filename = line
-        if status not in allowed_states:
+        if not force and status not in allowed_states:
             raise BuildError('hg unclean. Uncommited modifications?')
         if status == 'C' and not is_ignored(filename):
@@ -71 +71 @@
 
 
-def build(dst_dir, build_dir, formats):
+def build(dst_dir, build_dir, options):
     zine_version = get_zine_version()
     release_name = 'Zine-%s' % '-'.join(zine_version.split())
@@ -84 +84 @@
     # copy all tracked files into the build dir
     print 'Bootstrapping build directory [%s]' % build_dir
-    for filename in find_files():
+    for filename in find_files(options.force):
         target_folder = os.path.join(release_dir, os.path.dirname(filename))
         if not os.path.exists(target_folder):
@@ -124 +124 @@
     try:
         os.chdir(build_dir)
-        if formats.tar:
+        if options.tar:
             tarball_filename = archive_base + '.tar.gz'
             subprocess.call(['tar', 'vczf', tarball_filename, release_name])
             messages.append('Created tarball in %s' % tarball_filename)
-        if formats.zip:
+        if options.zip:
             zip_filename = archive_base + '.zip'
             subprocess.call(['zip', '-r', zip_filename, release_name])
@@ -147 +147 @@
     parser.add_option('--no-tar', dest='tar', action='store_false',
                       default=True, help='Do not generate a tarball')
+    parser.add_option('-f', '--force', dest='force', action='store_true',
+                      default=False, help='Force build, even if local '
+                      'modifications exist.')
     options, args = parser.parse_args()
     if len(args) != 1: