Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Package macos/Linux builds under release/debug dirs

Browse source 
This commit updates the 'mach package' command to generate output
under the target/release and target/debug directories when run on
macOS and Linux.

etc/ci/upload_nightly.sh has also been updated to upload packages from
the release/debug directories.
This commit is contained in:
William Lee 2016-12-09 13:37:13 -05:00
parent d4e986023a
commit 6a7fb6cd2b
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
etc/ci/upload_nightly.sh
View file

@ -28,7 +28,7 @@ upload() {
main() { main() {
if [[ "${#}" != 1 ]]; then if (( "${#}" != 1 )); then
usage >&2 usage >&2
return 1 return 1
fi fi
@ -41,13 +41,13 @@ main() {
package=target/arm-linux-androideabi/release/*."${extension}" package=target/arm-linux-androideabi/release/*."${extension}"
elif [[ "${platform}" == "linux" ]]; then elif [[ "${platform}" == "linux" ]]; then
extension=tar.gz extension=tar.gz
package=target/*."${extension}" package=target/release/*."${extension}"
elif [[ "${platform}" == "mac" ]]; then elif [[ "${platform}" == "mac" ]]; then
extension=dmg extension=dmg
package=target/*."${extension}" package=target/release/*."${extension}"
elif [[ "${platform}" == "macbrew" ]]; then elif [[ "${platform}" == "macbrew" ]]; then
extension=tar.gz extension=tar.gz
package=target/brew/*."${extension}" package=target/release/brew/*."${extension}"
elif [[ "${platform}" == "windows" ]]; then elif [[ "${platform}" == "windows" ]]; then
extension=msi extension=msi
package=target/release/msi/*.msi package=target/release/msi/*.msi

10
python/servo/package_commands.py
View file

@ -156,7 +156,7 @@ class PackageCommands(CommandBase):
dir_to_root = self.get_top_dir() dir_to_root = self.get_top_dir()
print("Creating Servo.app") print("Creating Servo.app")
dir_to_dmg = path.join(path.dirname(dir_to_build), 'dmg') dir_to_dmg = path.join(dir_to_build, 'dmg')
dir_to_app = path.join(dir_to_dmg, 'Servo.app') dir_to_app = path.join(dir_to_dmg, 'Servo.app')
dir_to_resources = path.join(dir_to_app, 'Contents', 'Resources') dir_to_resources = path.join(dir_to_app, 'Contents', 'Resources')
if path.exists(dir_to_dmg): if path.exists(dir_to_dmg):
@ -217,7 +217,7 @@ class PackageCommands(CommandBase):
print("Creating dmg") print("Creating dmg")
os.symlink('/Applications', path.join(dir_to_dmg, 'Applications')) os.symlink('/Applications', path.join(dir_to_dmg, 'Applications'))
dmg_path = path.join(path.dirname(dir_to_build), "servo-tech-demo.dmg") dmg_path = path.join(dir_to_build, "servo-tech-demo.dmg")
try: try:
subprocess.check_call(['hdiutil', 'create', '-volname', 'Servo', dmg_path, '-srcfolder', dir_to_dmg]) subprocess.check_call(['hdiutil', 'create', '-volname', 'Servo', dmg_path, '-srcfolder', dir_to_dmg])
@ -229,8 +229,8 @@ class PackageCommands(CommandBase):
print("Packaged Servo into " + dmg_path) print("Packaged Servo into " + dmg_path)
print("Creating brew package") print("Creating brew package")
dir_to_brew = path.join(path.dirname(dir_to_build), 'brew_tmp') dir_to_brew = path.join(dir_to_build, 'brew_tmp')
dir_to_tar = path.join(path.dirname(dir_to_build), 'brew') dir_to_tar = path.join(dir_to_build, 'brew')
if not path.exists(dir_to_tar): if not path.exists(dir_to_tar):
os.makedirs(dir_to_tar) os.makedirs(dir_to_tar)
tar_path = path.join(dir_to_tar, "servo.tar.gz") tar_path = path.join(dir_to_tar, "servo.tar.gz")
@ -320,7 +320,7 @@ class PackageCommands(CommandBase):
os.close(runservo) os.close(runservo)
print("Creating tarball") print("Creating tarball")
tar_path = path.join(self.get_target_dir(), 'servo-tech-demo.tar.gz') tar_path = path.join(path.dirname(binary_path), 'servo-tech-demo.tar.gz')
archive_deterministically(dir_to_temp, tar_path, prepend_path='servo/') archive_deterministically(dir_to_temp, tar_path, prepend_path='servo/')