From: minkee.lee Date: Thu, 3 Sep 2015 02:54:10 +0000 (+0900) Subject: build: changed DIBS variable for windows build. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42fc08cf87145d14a34b3fb1bc84052ccf6ed21d;p=sdk%2Femulator%2Femulator-manager.git build: changed DIBS variable for windows build. - $SRCDIR -> $MSYS_SRCDIR - $ROOTDIR -> $MSYS_ROOTDIR Change-Id: I075c5b56041c9f80b4bc36a5c2dde8b87f4515fd Signed-off-by: minkee.lee --- diff --git a/package/build.windows b/package/build.windows index 92dd2cf..e373b6f 100755 --- a/package/build.windows +++ b/package/build.windows @@ -2,10 +2,10 @@ # clean clean() { - echo "$SRCDIR" - rm -rf "$SRCDIR/"*.jar - rm -rf "$SRCDIR/"*.zip - rm -rf "$SRCDIR/"*.tar.gz + echo "$MSYS_SRCDIR" + rm -rf "$MSYS_SRCDIR/"*.jar + rm -rf "$MSYS_SRCDIR/"*.zip + rm -rf "$MSYS_SRCDIR/"*.tar.gz } prepare() @@ -24,8 +24,8 @@ build() { prepare - cd "$SRCDIR" - ant -buildfile build.xml -Dclasspath.dibs="${ROOTDIR}/tools/emulator/bin" make-jar-dibs + cd "$MSYS_SRCDIR" + ant -buildfile build.xml -Dclasspath.dibs="${MSYS_ROOTDIR}/tools/emulator/bin" make-jar-dibs # make emulator-manager.exe with Launch4j LAUNCH4J_RUN=0 @@ -49,13 +49,13 @@ build() else echo "Generating emulator-manager.exe SUCCESS." # Add signing to emulator-manager.exe - java -jar "$SIGNTOOL_JAR" "$SRCDIR/emulator-manager.exe" "$SRCDIR/emulator-manager.exe" emulator-manager.exe - if [ ! -f "$SRCDIR/emulator-manager.exe" ]; then + 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 echo "Codesigning fail" exit 1 fi - cd $SRCDIR + cd $MSYS_SRCDIR echo "signtool path: $SIGNTOOL" "$SIGNTOOL" verify "//pa" "emulator-manager.exe" CODESIGN_RET=$? @@ -73,15 +73,15 @@ build() # install install() { - BIN_DIR=$SRCDIR/package/emulator-manager.package.$TARGET_OS/data/tools/emulator + 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 "$SRCDIR/emulator-manager.jar" "$BIN_DIR/bin" - cp "$SRCDIR/emulator-manager.exe" "$BIN_DIR/bin/emulator-manager.exe" - cp "$SRCDIR/supplement/em-cli.bat" "$BIN_DIR/bin/em-cli.bat" - cp "$SRCDIR/resource/res/em.ico" "$BIN_DIR/icons" + 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" } [ "$1" = "clean" ] && clean