Merge lp:~jr.allen/unifield-toolbox/py27 into lp:unifield-toolbox

[Jeff Allen]

Unmerged revisions

238. By Jeff Allen on 2017-08-29

Remove tools that have been moved to https://code.launchpad.net/~unifield-team/unifield-wm/packaging_py27

=== removed file 'PatchTools/make_patch.bash'
--- PatchTools/make_patch.bash	2017-05-16 13:35:42 +0000
+++ PatchTools/make_patch.bash	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#! /bin/bash
-
-echo "This script has been replaced by make_patch.py."
-exit 1

=== removed file 'PatchTools/make_patch.py'
--- PatchTools/make_patch.py	2017-07-25 07:40:49 +0000
+++ PatchTools/make_patch.py	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import os
-import zipfile
-import time
-import re
-import filecmp
-
-if len(sys.argv) != 4:
-    print 'Expected 3 arguments: <from_tree> <to_tree> <patch_zip_name>'
-    sys.exit()
-
-# Skip things that do not belong in patch files.
-def should_skip(name):
-    return (name.endswith('.pyc') or
-            name in [
-                # this will be added at the end of this script instead
-                'release.py',
-                # these are related to the AIO and should not go in the patch
-                'Uninstall.exe',
-                'web/Uninstall.exe',
-                'setup.py',
-                'setup_py2exe_custom.py',
-                # these config files on the end-user installs should never
-                # be overwritten
-                'openerp-server.conf',
-                'web/conf/openerp-web-oc.cfg',
-    ])
-
-# Change the directory from the filesystem into a destination directory in
-# the patchfile (this mapping was set by the implementation of
-# updater.py)
-
-def dirmap(directory):
-    directory = directory.replace(sys.argv[2], '')
-    if directory.startswith('/'):
-        directory = directory[1:]
-    # unpdater.py expects lower case
-    if directory.startswith('Web'):
-        directory = 'w' + directory[1:]
-    # change directory Server/foo to foo
-    if directory == 'Server':
-        directory = ''
-    elif directory.startswith('Server/'):
-        directory = directory[7:]
-    return directory
-
-# The plan:
-#
-# for each file in the original distribution:
-#   remember it's name
-#   if not in new distribution:
-#     add to delete list
-#   else
-#     if new distribution version is different:
-#       add to patch file
-# for each file in the new distribution:
-#   if we did not already see it:
-#     add to patch file
-
-deleted = []
-seen = {}
-
-old = sys.argv[1]
-new = sys.argv[2]
-zf = zipfile.ZipFile(sys.argv[3], mode='w', compression=zipfile.ZIP_DEFLATED)
-
-for (dirpath, dirnames, filenames) in os.walk(old):
-    relpath = dirpath.replace(old, '')
-    if len(relpath) > 0 and relpath[0] == '/':
-        relpath = relpath[1:]
-    if relpath == 'ServerLog':
-        continue
-    for f in filenames:
-        oldf = os.path.join(dirpath, f)
-        newf = os.path.join(new, relpath, f)
-        dest = os.path.join(dirmap(relpath), f)
-        if should_skip(dest):
-            continue
-        if not os.path.exists(newf):
-            print "del %s" % dest
-            deleted.append(dest)
-        elif not filecmp.cmp(oldf, newf, False):
-            print "write mod %s" % dest
-            zf.write(newf, dest)
-        seen[dest] = True
-
-for (dirpath, dirnames, filenames) in os.walk(new):
-    relpath = dirpath.replace(new, '')
-    if len(relpath) > 0 and relpath[0] == '/':
-        relpath = relpath[1:]
-    if relpath == 'ServerLog':
-        continue
-    for f in filenames:
-        newf = os.path.join(new, relpath, f)
-        dest = os.path.join(dirmap(relpath), f)
-        if should_skip(dest) or dest in seen:
-            continue
-        print "write add %s" % dest
-        zf.write(newf, dest)
-        
-# special case for release.py: add the date onto the end of the
-# given version
-with open(os.path.join(new, 'Server', 'release.py')) as f:
-    lines = f.readlines()
-out = []
-for line in lines:
-    if line.startswith('version = '):
-        exec(line)
-    else:
-        out += line
-                            
-if not re.match('.*-[0-9]{8}-[0-9]{6}$', version):
-    version += time.strftime('-%Y%m%d-%H%M%S')
-    print "Version inserted into the patch is: %s" % version
-else:
-    print "Version in the source is already timestamped: %s" % version
-
-out += 'version = \'%s\'\n' % version
-zf.writestr('release.py', ''.join(out))
-
-zf.writestr('delete.txt', '\n'.join(deleted))
-zf.close()
-

=== removed file 'PatchTools/set_win_tree.bash'
--- PatchTools/set_win_tree.bash	2016-09-14 17:28:45 +0000
+++ PatchTools/set_win_tree.bash	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-#! /bin/bash
-usage()
-{
-    cat << EOF
-usage: $0 options [name]
-
-This script set a UniField windows source tree
-
-OPTIONS:
--h          This help msg
--s <serie>  Launchpad serie to retrieve (default trunk)
--t <tag>    Tag name
-<directory> Directory
-EOF
-}
-
-TAG=""
-BZRBRANCH=""
-SYNCBZRBRANCH=""
-while getopts "hs:t:" OPTION
-do
-    case $OPTION in
-        h)
-            usage
-            exit 1
-            ;;
-        t)
-           TAG="-r $OPTARG"
-           ;;
-        s)
-           BZRBRANCH="/$OPTARG"
-           SYNCBZRBRANCH="-$OPTARG"
-           ;;
-        ?)
-           usage
-           exit 0
-           ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-if [ -z "$1" ]; then
-    usage
-    exit 1
-fi
-
-if [ -f "$1" -o -d "$1" ]; then
-    echo "Directory $1 exists"
-    exit 1
-fi
-
-mkdir $1
-cd $1
-
-echo "== web =="
-echo bzr branch $TAG lp:unifield-web/${BZRBRANCH} unifield-web
-bzr branch $TAG lp:unifield-web/${BZRBRANCH} unifield-web
-
-echo "== server =="
-echo bzr branch $TAG lp:unifield-server${BZRBRANCH} unifield-server
-bzr branch $TAG lp:unifield-server${BZRBRANCH} unifield-server
-cd unifield-server/bin/addons
-
-#echo "== addons =="
-#echo bzr branch $TAG lp:unifield-addons${BZRBRANCH} unifield-addons
-#bzr branch $TAG lp:unifield-addons${BZRBRANCH} unifield-addons
-#mv unifield-addons/* .
-#rm -fr unifield-addons
-
-#echo "== wm =="
-#echo bzr branch $TAG lp:unifield-wm${BZRBRANCH} unifield-wm
-#bzr branch $TAG lp:unifield-wm${BZRBRANCH} unifield-wm
-#mv unifield-wm/* .
-#rm -fr unifield-wm
-
-#echo "== sync_module =="
-#echo bzr branch $TAG lp:unifield-wm/sync${SYNCBZRBRANCH} sync_module_prod
-#bzr branch $TAG lp:unifield-wm/sync${SYNCBZRBRANCH} sync_module_prod
-#mv sync_module_prod/* .
-#rm -fr sync_module_prod