From 054a8c315adc5088d451f735f97e1aa62fe62c3f Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Mon, 2 Nov 2015 14:09:22 +0900 Subject: [PATCH] build: add common build script file. - build.common file provides common clean, build, install function. - Merge ubuntu-32/64 build host to ubuntu-32. Change-Id: I81cc22fbf800604985c36374fe814009c681b6c8 Signed-off-by: minkee.lee --- package/build.common | 36 ++++++++++++++++++++++++++++++++++++ package/build.linux | 28 ++++++---------------------- package/build.macos-64 | 28 ++++++---------------------- package/build.windows | 36 ++++++++++-------------------------- package/pkginfo.manifest | 9 +-------- 5 files changed, 59 insertions(+), 78 deletions(-) create mode 100644 package/build.common diff --git a/package/build.common b/package/build.common new file mode 100644 index 0000000..7d5a20b --- /dev/null +++ b/package/build.common @@ -0,0 +1,36 @@ +build_common() +{ + cd "$SRCDIR" + cp "$ROOTDIR/swt_4.4/swt.jar" "$ROOTDIR/" + cp "$ROOTDIR/library/sdk-manager.jar" "$ROOTDIR/" + ant -buildfile build.xml -Dclasspath.dibs="$ROOTDIR" make-jar-dibs +} + + +install_common() +{ + BIN_DIR=$SRCDIR/package/emulator-manager.package.$TARGET_OS/data/tools/emulator + mkdir -p "$BIN_DIR/bin" + mkdir -p "$BIN_DIR/icons" + + mv "$SRCDIR/emulator-manager.jar" "$BIN_DIR/bin" + cp "$SRCDIR/resource/res/em.ico" "$BIN_DIR/icons" + + case "${TARGET_OS}" in + "macos-64") + cp "$SRCDIR/supplement/emulator-manager-mac.sh" "$BIN_DIR/bin/emulator-manager" + cp "$SRCDIR/supplement/em-cli-mac.sh" "$BIN_DIR/bin/em-cli" + ;; + "ubuntu"*) + cp "$SRCDIR/supplement/emulator-manager.sh" "$BIN_DIR/bin/emulator-manager" + cp "$SRCDIR/supplement/em-cli.sh" "$BIN_DIR/bin/em-cli" + ;; + "windows"*) + cp "$SRCDIR/emulator-manager.exe" "$BIN_DIR/bin/emulator-manager.exe" + cp "$SRCDIR/supplement/em-cli.bat" "$BIN_DIR/bin/em-cli.bat" + ;; + esac + +} + + diff --git a/package/build.linux b/package/build.linux index 923f0ff..6f07079 100755 --- a/package/build.linux +++ b/package/build.linux @@ -1,37 +1,21 @@ #!/bin/sh -xe + # clean clean() { - echo "$SRCDIR" - rm -rf "$SRCDIR/"*.jar - rm -rf "$SRCDIR/"*.zip - rm -rf "$SRCDIR/"*.tar.gz + echo "Nothing to do." } # build build() { - cd "$SRCDIR" - cp "$ROOTDIR/swt_4.4/swt.jar" "$ROOTDIR/" - cp "$ROOTDIR/library/sdk-manager.jar" "$ROOTDIR/" - ant -buildfile build.xml -Dclasspath.dibs="$ROOTDIR" make-jar-dibs + . $SRCDIR/package/build.common + build_common } # install install() { - BIN_DIR=$SRCDIR/package/emulator-manager.package.$TARGET_OS/data/tools/emulator - mkdir -p "$BIN_DIR/bin" - mkdir -p "$BIN_DIR/icons" - - mv "$SRCDIR/emulator-manager.jar" "$BIN_DIR/bin" - cp "$SRCDIR/supplement/emulator-manager.sh" "$BIN_DIR/bin/emulator-manager" - cp "$SRCDIR/supplement/em-cli.sh" "$BIN_DIR/bin/em-cli" - cp "$SRCDIR/resource/res/em.ico" "$BIN_DIR/icons" + . $SRCDIR/package/build.common + install_common } - -[ "$1" = "clean" ] && clean -[ "$1" = "build" ] && build -[ "$1" = "install" ] && install - -echo "success" diff --git a/package/build.macos-64 b/package/build.macos-64 index 78648b0..4baafa7 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -1,33 +1,23 @@ #!/bin/sh -xe + # clean clean() { - echo "$SRCDIR" - rm -rf "$SRCDIR/"*.jar - rm -rf "$SRCDIR/"*.zip - rm -rf "$SRCDIR/"*.tar.gz + echo "Nothing to do." } # build build() { - cd "$SRCDIR" - cp "$ROOTDIR/swt_4.4/swt.jar" "$ROOTDIR/" - cp "$ROOTDIR/library/sdk-manager.jar" "$ROOTDIR/" - ant -buildfile build.xml -Dclasspath.dibs="${ROOTDIR}" make-jar-dibs + . $SRCDIR/package/build.common + build_common } # install install() { - BIN_DIR=$SRCDIR/package/emulator-manager.package.$TARGET_OS/data/tools/emulator - mkdir -p "$BIN_DIR/bin" - mkdir -p "$BIN_DIR/icons" - - mv "$SRCDIR/emulator-manager.jar" "$BIN_DIR/bin" - cp "$SRCDIR/supplement/emulator-manager-mac.sh" "$BIN_DIR/bin/emulator-manager" - cp "$SRCDIR/supplement/em-cli-mac.sh" "$BIN_DIR/bin/em-cli" - cp "$SRCDIR/resource/res/em.ico" "$BIN_DIR/icons" + . $SRCDIR/package/build.common + install_common # for emulator-manager.app APP_DIR=$SRCDIR/emulator-manager.app/Contents @@ -52,9 +42,3 @@ install() mv "$SRCDIR/emulator-manager.app" "$BIN_DIR/bin" } - -[ "$1" = "clean" ] && clean -[ "$1" = "build" ] && build -[ "$1" = "install" ] && install - -echo "success" diff --git a/package/build.windows b/package/build.windows index 0a395b0..769682a 100755 --- a/package/build.windows +++ b/package/build.windows @@ -1,11 +1,9 @@ #!/bin/sh -xe + # clean clean() { - echo "$MSYS_SRCDIR" - rm -rf "$MSYS_SRCDIR/"*.jar - rm -rf "$MSYS_SRCDIR/"*.zip - rm -rf "$MSYS_SRCDIR/"*.tar.gz + echo "Nothing to do." } prepare() @@ -24,10 +22,9 @@ build() { prepare - cd "$MSYS_SRCDIR" - cp "$MSYS_ROOTDIR/swt_4.4/swt.jar" "$MSYS_ROOTDIR/" - cp "$MSYS_ROOTDIR/library/sdk-manager.jar" "$MSYS_ROOTDIR/" - ant -buildfile build.xml -Dclasspath.dibs="${MSYS_ROOTDIR}" make-jar-dibs + . $SRCDIR/package/build.common + build_common + # make emulator-manager.exe with Launch4j LAUNCH4J_RUN=0 @@ -51,13 +48,13 @@ build() else echo "Generating emulator-manager.exe SUCCESS." # Add signing to emulator-manager.exe - java -jar "$SIGNTOOL_JAR" "$MSYS_SRCDIR/emulator-manager.exe" "$MSYS_SRCDIR/emulator-manager.exe" emulator-manager.exe - if [ ! -f "$MSYS_SRCDIR/emulator-manager.exe" ]; then + java -jar "$SIGNTOOL_JAR" "$SRCDIR/emulator-manager.exe" "$SRCDIR/emulator-manager.exe" emulator-manager.exe + if [ ! -f "$SRCDIR/emulator-manager.exe" ]; then echo "Codesigning fail" exit 1 fi - cd $MSYS_SRCDIR + cd $SRCDIR echo "signtool path: $SIGNTOOL" "$SIGNTOOL" verify "//pa" "emulator-manager.exe" CODESIGN_RET=$? @@ -75,19 +72,6 @@ build() # install install() { - BIN_DIR=$MSYS_SRCDIR/package/emulator-manager.package.$TARGET_OS/data/tools/emulator - mkdir -p "$BIN_DIR/bin" - mkdir -p "$BIN_DIR/icons" - # mkdir -p $BIN_DIR/templates - - mv "$MSYS_SRCDIR/emulator-manager.jar" "$BIN_DIR/bin" - cp "$MSYS_SRCDIR/emulator-manager.exe" "$BIN_DIR/bin/emulator-manager.exe" - cp "$MSYS_SRCDIR/supplement/em-cli.bat" "$BIN_DIR/bin/em-cli.bat" - cp "$MSYS_SRCDIR/resource/res/em.ico" "$BIN_DIR/icons" + . $SRCDIR/package/build.common + install_common } - -[ "$1" = "clean" ] && clean -[ "$1" = "build" ] && build -[ "$1" = "install" ] && install - -echo "success" diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 155df05..ffc8937 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -3,20 +3,13 @@ Version: 2.4.159 Maintainer: MinKee Lee , Jihye Kim Package: emulator-manager -OS: ubuntu-32 +OS: ubuntu-32, ubuntu-64 Build-host-os: ubuntu-32 Build-dependency: emulator-common-lib-dev, sdk-manager Install-dependency: emulator-common-lib, emulator-supplements Description: Tizen Emulator Manager Package: emulator-manager -OS: ubuntu-64 -Build-host-os: ubuntu-64 -Build-dependency: emulator-common-lib-dev, sdk-manager -Install-dependency: emulator-common-lib, emulator-supplements -Description: Tizen Emulator Manager - -Package: emulator-manager OS: windows-32, windows-64 Build-host-os: windows-32 Build-dependency: emulator-common-lib-dev, sdk-manager -- 2.7.4