1
=== removed file 'PatchTools/make_patch.bash'
2
--- PatchTools/make_patch.bash	2017-05-16 13:35:42 +0000
3
+++ PatchTools/make_patch.bash	1970-01-01 00:00:00 +0000
4
@@ -1,4 +0,0 @@
5
1
#! /bin/bash
6
2
7
3
echo "This script has been replaced by make_patch.py."
8
4
exit 1
9
5
0
10
=== removed file 'PatchTools/make_patch.py'
11
--- PatchTools/make_patch.py	2017-07-25 07:40:49 +0000
12
+++ PatchTools/make_patch.py	1970-01-01 00:00:00 +0000
13
@@ -1,125 +0,0 @@
14
1
#!/usr/bin/env python
15
2
16
3
import sys
17
4
import os
18
5
import zipfile
19
6
import time
20
7
import re
21
8
import filecmp
22
9
23
10
if len(sys.argv) != 4:
24
11
    print 'Expected 3 arguments: <from_tree> <to_tree> <patch_zip_name>'
25
12
    sys.exit()
26
13
27
14
# Skip things that do not belong in patch files.
28
15
def should_skip(name):
29
16
    return (name.endswith('.pyc') or
30
17
            name in [
31
18
                # this will be added at the end of this script instead
32
19
                'release.py',
33
20
                # these are related to the AIO and should not go in the patch
34
21
                'Uninstall.exe',
35
22
                'web/Uninstall.exe',
36
23
                'setup.py',
37
24
                'setup_py2exe_custom.py',
38
25
                # these config files on the end-user installs should never
39
26
                # be overwritten
40
27
                'openerp-server.conf',
41
28
                'web/conf/openerp-web-oc.cfg',
42
29
    ])
43
30
44
31
# Change the directory from the filesystem into a destination directory in
45
32
# the patchfile (this mapping was set by the implementation of
46
33
# updater.py)
47
34
48
35
def dirmap(directory):
49
36
    directory = directory.replace(sys.argv[2], '')
50
37
    if directory.startswith('/'):
51
38
        directory = directory[1:]
52
39
    # unpdater.py expects lower case
53
40
    if directory.startswith('Web'):
54
41
        directory = 'w' + directory[1:]
55
42
    # change directory Server/foo to foo
56
43
    if directory == 'Server':
57
44
        directory = ''
58
45
    elif directory.startswith('Server/'):
59
46
        directory = directory[7:]
60
47
    return directory
61
48
62
49
# The plan:
63
50
#
64
51
# for each file in the original distribution:
65
52
#   remember it's name
66
53
#   if not in new distribution:
67
54
#     add to delete list
68
55
#   else
69
56
#     if new distribution version is different:
70
57
#       add to patch file
71
58
# for each file in the new distribution:
72
59
#   if we did not already see it:
73
60
#     add to patch file
74
61
75
62
deleted = []
76
63
seen = {}
77
64
78
65
old = sys.argv[1]
79
66
new = sys.argv[2]
80
67
zf = zipfile.ZipFile(sys.argv[3], mode='w', compression=zipfile.ZIP_DEFLATED)
81
68
82
69
for (dirpath, dirnames, filenames) in os.walk(old):
83
70
    relpath = dirpath.replace(old, '')
84
71
    if len(relpath) > 0 and relpath[0] == '/':
85
72
        relpath = relpath[1:]
86
73
    if relpath == 'ServerLog':
87
74
        continue
88
75
    for f in filenames:
89
76
        oldf = os.path.join(dirpath, f)
90
77
        newf = os.path.join(new, relpath, f)
91
78
        dest = os.path.join(dirmap(relpath), f)
92
79
        if should_skip(dest):
93
80
            continue
94
81
        if not os.path.exists(newf):
95
82
            print "del %s" % dest
96
83
            deleted.append(dest)
97
84
        elif not filecmp.cmp(oldf, newf, False):
98
85
            print "write mod %s" % dest
99
86
            zf.write(newf, dest)
100
87
        seen[dest] = True
101
88
102
89
for (dirpath, dirnames, filenames) in os.walk(new):
103
90
    relpath = dirpath.replace(new, '')
104
91
    if len(relpath) > 0 and relpath[0] == '/':
105
92
        relpath = relpath[1:]
106
93
    if relpath == 'ServerLog':
107
94
        continue
108
95
    for f in filenames:
109
96
        newf = os.path.join(new, relpath, f)
110
97
        dest = os.path.join(dirmap(relpath), f)
111
98
        if should_skip(dest) or dest in seen:
112
99
            continue
113
100
        print "write add %s" % dest
114
101
        zf.write(newf, dest)
115
102
        
116
103
# special case for release.py: add the date onto the end of the
117
104
# given version
118
105
with open(os.path.join(new, 'Server', 'release.py')) as f:
119
106
    lines = f.readlines()
120
107
out = []
121
108
for line in lines:
122
109
    if line.startswith('version = '):
123
110
        exec(line)
124
111
    else:
125
112
        out += line
126
113
                            
127
114
if not re.match('.*-[0-9]{8}-[0-9]{6}$', version):
128
115
    version += time.strftime('-%Y%m%d-%H%M%S')
129
116
    print "Version inserted into the patch is: %s" % version
130
117
else:
131
118
    print "Version in the source is already timestamped: %s" % version
132
119
133
120
out += 'version = \'%s\'\n' % version
134
121
zf.writestr('release.py', ''.join(out))
135
122
136
123
zf.writestr('delete.txt', '\n'.join(deleted))
137
124
zf.close()
138
125
139
126
0
140
=== removed file 'PatchTools/set_win_tree.bash'
141
--- PatchTools/set_win_tree.bash	2016-09-14 17:28:45 +0000
142
+++ PatchTools/set_win_tree.bash	1970-01-01 00:00:00 +0000
143
@@ -1,80 +0,0 @@
144
1
#! /bin/bash
145
2
usage()
146
3
{
147
4
    cat << EOF
148
5
usage: $0 options [name]
149
6
150
7
This script set a UniField windows source tree
151
8
152
9
OPTIONS:
153
10
-h          This help msg
154
11
-s <serie>  Launchpad serie to retrieve (default trunk)
155
12
-t <tag>    Tag name
156
13
<directory> Directory
157
14
EOF
158
15
}
159
16
160
17
TAG=""
161
18
BZRBRANCH=""
162
19
SYNCBZRBRANCH=""
163
20
while getopts "hs:t:" OPTION
164
21
do
165
22
    case $OPTION in
166
23
        h)
167
24
            usage
168
25
            exit 1
169
26
            ;;
170
27
        t)
171
28
           TAG="-r $OPTARG"
172
29
           ;;
173
30
        s)
174
31
           BZRBRANCH="/$OPTARG"
175
32
           SYNCBZRBRANCH="-$OPTARG"
176
33
           ;;
177
34
        ?)
178
35
           usage
179
36
           exit 0
180
37
           ;;
181
38
    esac
182
39
done
183
40
184
41
shift $(($OPTIND - 1))
185
42
if [ -z "$1" ]; then
186
43
    usage
187
44
    exit 1
188
45
fi
189
46
190
47
if [ -f "$1" -o -d "$1" ]; then
191
48
    echo "Directory $1 exists"
192
49
    exit 1
193
50
fi
194
51
195
52
mkdir $1
196
53
cd $1
197
54
198
55
echo "== web =="
199
56
echo bzr branch $TAG lp:unifield-web/${BZRBRANCH} unifield-web
200
57
bzr branch $TAG lp:unifield-web/${BZRBRANCH} unifield-web
201
58
202
59
echo "== server =="
203
60
echo bzr branch $TAG lp:unifield-server${BZRBRANCH} unifield-server
204
61
bzr branch $TAG lp:unifield-server${BZRBRANCH} unifield-server
205
62
cd unifield-server/bin/addons
206
63
207
64
#echo "== addons =="
208
65
#echo bzr branch $TAG lp:unifield-addons${BZRBRANCH} unifield-addons
209
66
#bzr branch $TAG lp:unifield-addons${BZRBRANCH} unifield-addons
210
67
#mv unifield-addons/* .
211
68
#rm -fr unifield-addons
212
69
213
70
#echo "== wm =="
214
71
#echo bzr branch $TAG lp:unifield-wm${BZRBRANCH} unifield-wm
215
72
#bzr branch $TAG lp:unifield-wm${BZRBRANCH} unifield-wm
216
73
#mv unifield-wm/* .
217
74
#rm -fr unifield-wm
218
75
219
76
#echo "== sync_module =="
220
77
#echo bzr branch $TAG lp:unifield-wm/sync${SYNCBZRBRANCH} sync_module_prod
221
78
#bzr branch $TAG lp:unifield-wm/sync${SYNCBZRBRANCH} sync_module_prod
222
79
#mv sync_module_prod/* .
223
80
#rm -fr sync_module_prod
Status:	Needs review
Proposed branch:	lp:~jr.allen/unifield-toolbox/py27
Merge into:	lp:unifield-toolbox
Diff against target:	223 lines (+0/-209) 3 files modified PatchTools/make_patch.bash (+0/-4) PatchTools/make_patch.py (+0/-125) PatchTools/set_win_tree.bash (+0/-80)
To merge this branch:	bzr merge lp:~jr.allen/unifield-toolbox/py27
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
UniField Dev Team		2017-08-29	Pending
Review via email: mp+329810@code.launchpad.net