diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-28 18:37:12 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-28 18:37:12 +0000 |
commit | a9acd1f45b6ff7553317061733c6b9d51aad9450 (patch) | |
tree | 5ab3a9e38c74384bc5ed37cfba6a5b0442993a75 | |
parent | 980e0c7383fdb913014a71cc69725b42ebca4254 (diff) | |
download | rockbox-a9acd1f45b6ff7553317061733c6b9d51aad9450.tar.gz rockbox-a9acd1f45b6ff7553317061733c6b9d51aad9450.zip |
Restructure and rename deploy-release.py.
Move actual working functionality into a python module, and write a
simple script to use it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27598 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | rbutil/rbutilqt/deploy-rbutil.py | 68 | ||||
-rwxr-xr-x | rbutil/rbutilqt/deploy.py (renamed from rbutil/rbutilqt/deploy-release.py) | 55 |
2 files changed, 79 insertions, 44 deletions
diff --git a/rbutil/rbutilqt/deploy-rbutil.py b/rbutil/rbutilqt/deploy-rbutil.py new file mode 100755 index 0000000000..10c3159fe2 --- /dev/null +++ b/rbutil/rbutilqt/deploy-rbutil.py | |||
@@ -0,0 +1,68 @@ | |||
1 | #!/usr/bin/python | ||
2 | # __________ __ ___. | ||
3 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | # \/ \/ \/ \/ \/ | ||
8 | # $Id$ | ||
9 | # | ||
10 | # Copyright (c) 2010 Dominik Riebeling | ||
11 | # | ||
12 | # All files in this archive are subject to the GNU General Public License. | ||
13 | # See the file COPYING in the source tree root for full license agreement. | ||
14 | # | ||
15 | # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | # KIND, either express or implied. | ||
17 | # | ||
18 | |||
19 | import deploy | ||
20 | import sys | ||
21 | |||
22 | deploy.program = "RockboxUtility" | ||
23 | deploy.project = "rbutil/rbutilqt/rbutilqt.pro" | ||
24 | deploy.svnserver = "svn://svn.rockbox.org/rockbox/" | ||
25 | deploy.svnpaths = \ | ||
26 | [ "rbutil/", | ||
27 | "tools/ucl", | ||
28 | "tools/rbspeex", | ||
29 | "apps/codecs/libspeex", | ||
30 | "docs/COPYING", | ||
31 | "docs/CREDITS", | ||
32 | "tools/iriver.c", | ||
33 | "tools/Makefile", | ||
34 | "tools/mkboot.h", | ||
35 | "tools/voicefont.c", | ||
36 | "tools/VOICE_PAUSE.wav", | ||
37 | "tools/wavtrim.h", | ||
38 | "tools/iriver.h", | ||
39 | "tools/mkboot.c", | ||
40 | "tools/telechips.c", | ||
41 | "tools/telechips.h", | ||
42 | "tools/voicefont.h", | ||
43 | "tools/wavtrim.c", | ||
44 | "tools/sapi_voice.vbs" ] | ||
45 | deploy.useupx = False | ||
46 | deploy.bundlecopy = { | ||
47 | "icons/rbutilqt.icns" : "Contents/Resources/", | ||
48 | "Info.plist" : "Contents/" | ||
49 | } | ||
50 | # Windows nees some special treatment. Differentiate between program name | ||
51 | # and executable filename. | ||
52 | if sys.platform == "win32": | ||
53 | deploy.progexe = "Release/" + deploy.program + ".exe" | ||
54 | deploy.make = "mingw32-make" | ||
55 | elif sys.platform == "darwin": | ||
56 | deploy.progexe = deploy.program + ".app" | ||
57 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are | ||
58 | # compatible with 10.4 requires using gcc-4.0. | ||
59 | if not "QMAKESPEC" in deploy.environment: | ||
60 | deploy.environment["QMAKESPEC"] = "macx-g++40" | ||
61 | else: | ||
62 | deploy.progexe = deploy.program | ||
63 | # all files of the program. Will get put into an archive after building | ||
64 | # (zip on w32, tar.bz2 on Linux). Does not apply on Mac which uses dmg. | ||
65 | deploy.programfiles = [ deploy.progexe ] | ||
66 | |||
67 | deploy.deploy() | ||
68 | |||
diff --git a/rbutil/rbutilqt/deploy-release.py b/rbutil/rbutilqt/deploy.py index ffb8f71c0e..f4f3fac786 100755 --- a/rbutil/rbutilqt/deploy-release.py +++ b/rbutil/rbutilqt/deploy.py | |||
@@ -63,57 +63,23 @@ except ImportError: | |||
63 | # == Global stuff == | 63 | # == Global stuff == |
64 | # Windows nees some special treatment. Differentiate between program name | 64 | # Windows nees some special treatment. Differentiate between program name |
65 | # and executable filename. | 65 | # and executable filename. |
66 | program = "RockboxUtility" | 66 | program = "" |
67 | project = "rbutil/rbutilqt/rbutilqt.pro" | 67 | project = "" |
68 | environment = os.environ | 68 | environment = os.environ |
69 | progexe = "" | ||
69 | make = "make" | 70 | make = "make" |
70 | if sys.platform == "win32": | 71 | programfiles = [] |
71 | progexe = "Release/" + program + ".exe" | 72 | |
72 | make = "mingw32-make" | 73 | svnserver = "" |
73 | elif sys.platform == "darwin": | ||
74 | progexe = program + ".app" | ||
75 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are | ||
76 | # compatible with 10.4 requires using gcc-4.0. | ||
77 | if not "QMAKESPEC" in environment: | ||
78 | environment["QMAKESPEC"] = "macx-g++40" | ||
79 | else: | ||
80 | progexe = program | ||
81 | |||
82 | # all files of the program. Will get put into an archive after building | ||
83 | # (zip on w32, tar.bz2 on Linux). Does not apply on Mac which uses dmg. | ||
84 | programfiles = [ progexe ] | ||
85 | |||
86 | svnserver = "svn://svn.rockbox.org/rockbox/" | ||
87 | # Paths and files to retrieve from svn when creating a tarball. | 74 | # Paths and files to retrieve from svn when creating a tarball. |
88 | # This is a mixed list, holding both paths and filenames. | 75 | # This is a mixed list, holding both paths and filenames. |
89 | svnpaths = [ "rbutil/", | 76 | svnpaths = [ ] |
90 | "tools/ucl", | ||
91 | "tools/rbspeex", | ||
92 | "apps/codecs/libspeex", | ||
93 | "docs/COPYING", | ||
94 | "docs/CREDITS", | ||
95 | "tools/iriver.c", | ||
96 | "tools/Makefile", | ||
97 | "tools/mkboot.h", | ||
98 | "tools/voicefont.c", | ||
99 | "tools/VOICE_PAUSE.wav", | ||
100 | "tools/wavtrim.h", | ||
101 | "tools/iriver.h", | ||
102 | "tools/mkboot.c", | ||
103 | "tools/telechips.c", | ||
104 | "tools/telechips.h", | ||
105 | "tools/voicefont.h", | ||
106 | "tools/wavtrim.c", | ||
107 | "tools/sapi_voice.vbs" ] | ||
108 | # set this to true to run upx on the resulting binary, false to skip this step. | 77 | # set this to true to run upx on the resulting binary, false to skip this step. |
109 | # only used on w32. | 78 | # only used on w32. |
110 | useupx = False | 79 | useupx = False |
111 | 80 | ||
112 | # OS X: files to copy into the bundle. Workaround for out-of-tree builds. | 81 | # OS X: files to copy into the bundle. Workaround for out-of-tree builds. |
113 | bundlecopy = { | 82 | bundlecopy = { } |
114 | "icons/rbutilqt.icns" : "Contents/Resources/", | ||
115 | "Info.plist" : "Contents/" | ||
116 | } | ||
117 | 83 | ||
118 | # == Functions == | 84 | # == Functions == |
119 | def usage(myself): | 85 | def usage(myself): |
@@ -374,8 +340,9 @@ def tempclean(workfolder, nopro): | |||
374 | print "Temporary files kept at %s" % workfolder | 340 | print "Temporary files kept at %s" % workfolder |
375 | 341 | ||
376 | 342 | ||
377 | def main(): | 343 | def deploy(): |
378 | startup = time.time() | 344 | startup = time.time() |
345 | |||
379 | try: | 346 | try: |
380 | opts, args = getopt.getopt(sys.argv[1:], "q:p:t:a:sbdkh", | 347 | opts, args = getopt.getopt(sys.argv[1:], "q:p:t:a:sbdkh", |
381 | ["qmake=", "project=", "tag=", "add=", "source-only", "binary-only", "dynamic", "keep-temp", "help"]) | 348 | ["qmake=", "project=", "tag=", "add=", "source-only", "binary-only", "dynamic", "keep-temp", "help"]) |
@@ -526,5 +493,5 @@ def main(): | |||
526 | 493 | ||
527 | 494 | ||
528 | if __name__ == "__main__": | 495 | if __name__ == "__main__": |
529 | main() | 496 | deploy() |
530 | 497 | ||