gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for --current-dev=pkg and --last-stable=pkg

Browse Source
This commit is contained in:
Anirudha Bose 2014-08-17 22:51:58 +05:30 committed by sftnight
parent 72cab550ee
commit aa4a20c3ab
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/packaging/README.md
View File

@ -173,10 +173,10 @@ optional arguments:
Check if packages required by the script are installed
--current-dev CURRENT_DEV
Package the latest development snapshot in one of
these formats: tar | deb | nsis
these formats: tar | deb | nsis | rpm | dmg | pkg
--last-stable LAST_STABLE
Package the last stable snapshot in one of these
formats: tar | deb | nsis
formats: tar | deb | nsis | rpm | dmg | pkg
--tarball-tag TARBALL_TAG
Package the snapshot of a given tag in a tarball
(.tar.bz2)
@ -200,7 +200,15 @@ optional arguments:
--make-proper MAKE_PROPER
Internal option to support calls from build system
```
If you want CPT to build a package by detecting your platform automatically,
use the value 'pkg'.
```sh
./cpt.sh --current-dev=pkg
```
or
```sh
./cpt.sh --last-stable=pkg
```
###Overriding Default Variables
There are a select number of variables which can be set to make CPT work
differently. This eliminates the need to manually edit the script.

20
tools/packaging/cpt.py
View File

@ -1250,8 +1250,8 @@ end tell
parser = argparse.ArgumentParser(description='Cling Packaging Tool')
parser.add_argument('-c', '--check-requirements', help='Check if packages required by the script are installed', action='store_true')
parser.add_argument('--current-dev', help='Package the latest development snapshot in one of these formats: tar | deb | nsis')
parser.add_argument('--last-stable', help='Package the last stable snapshot in one of these formats: tar | deb | nsis')
parser.add_argument('--current-dev', help='Package the latest development snapshot in one of these formats: tar | deb | nsis | rpm | dmg | pkg')
parser.add_argument('--last-stable', help='Package the last stable snapshot in one of these formats: tar | deb | nsis | rpm | dmg | pkg')
parser.add_argument('--tarball-tag', help='Package the snapshot of a given tag in a tarball (.tar.bz2)')
parser.add_argument('--deb-tag', help='Package the snapshot of a given tag in a Debian package (.deb)')
parser.add_argument('--rpm-tag', help='Package the snapshot of a given tag in an RPM package (.rpm)')
@ -1500,7 +1500,7 @@ if args['current_dev']:
tarball()
cleanup()
elif args['current_dev'] == 'deb':
elif args['current_dev'] == 'deb' or (args['current_dev'] == 'pkg' and DIST == 'Ubuntu'):
compile(os.path.join(workdir, 'cling-' + VERSION))
install_prefix()
if args['no_test'] != True:
@ -1509,7 +1509,7 @@ if args['current_dev']:
debianize()
cleanup()
elif args['current_dev'] == 'rpm':
elif args['current_dev'] == 'rpm' or (args['current_dev'] == 'pkg' and platform.dist()[0] == 'redhat'):
compile(os.path.join(workdir, 'cling-' + VERSION.replace('-' + REVISION[:7], '')))
install_prefix()
if args['no_test'] != True:
@ -1518,7 +1518,7 @@ if args['current_dev']:
rpm_build()
cleanup()
elif args['current_dev'] == 'nsis':
elif args['current_dev'] == 'nsis' or (args['current_dev'] == 'pkg' and OS == 'Windows'):
get_win_dep()
compile(os.path.join(workdir, 'cling-' + RELEASE + '-' + platform.machine().lower() + '-' + VERSION))
install_prefix()
@ -1528,7 +1528,7 @@ if args['current_dev']:
build_nsis()
cleanup()
elif args['current_dev'] == 'dmg':
elif args['current_dev'] == 'dmg' or (args['current_dev'] == 'pkg' and OS == 'Darwin'):
compile(os.path.join(workdir, 'cling-' + DIST + '-' + REV + '-' + platform.machine().lower() + '-' + VERSION))
install_prefix()
if args['no_test'] != True:
@ -1557,7 +1557,7 @@ if args['last_stable']:
tarball()
cleanup()
elif args['last_stable'] == 'deb':
elif args['last_stable'] == 'deb' or (args['last_stable'] == 'pkg' and DIST == 'Ubuntu'):
set_version()
compile(os.path.join(workdir, 'cling-' + VERSION))
install_prefix()
@ -1567,7 +1567,7 @@ if args['last_stable']:
debianize()
cleanup()
elif args['last_stable'] == 'rpm':
elif args['last_stable'] == 'rpm' or (args['last_stable'] == 'pkg' and platform.dist()[0] == 'redhat'):
set_version()
compile(os.path.join(workdir, 'cling-' + VERSION))
install_prefix()
@ -1577,7 +1577,7 @@ if args['last_stable']:
rpm_build()
cleanup()
elif args['last_stable'] == 'nsis':
elif args['last_stable'] == 'nsis' or (args['last_stable'] == 'pkg' and OS == 'Windows'):
set_version()
get_win_dep()
compile(os.path.join(workdir, 'cling-' + DIST + '-' + REV + '-' + platform.machine() + '-' + VERSION))
@ -1588,7 +1588,7 @@ if args['last_stable']:
build_nsis()
cleanup()
elif args['last_stable'] == 'dmg':
elif args['last_stable'] == 'dmg' or (args['last_stable'] == 'pkg' and OS == 'Darwin'):
set_version()
compile(os.path.join(workdir, 'cling-' + DIST + '-' + REV + '-' + platform.machine().lower() + '-' + VERSION))
install_prefix()