Version to make only WHPX windows package.

Change-Id: I6b528eb8e3517f0c8491818f6355d3faf637f212
Signed-off-by: Varinder Pratap <varinder.p@samsung.com>

diff --git a/package/build.common b/package/build.common
index 5a164a2ab36bdcbd0cce9617d7b27b4aa8bb38a5..0f9aaca3d054943c856b92e1283d66c6f67d20ba 100644 (file)
--- a/package/build.common
+++ b/package/build.common
@@ -42,16 +42,12 @@ build_common()
 # install_common
 install_common()
 {
-       TIZEN_VERSIONS="7.0 6.5 6.0 5.0 4.0 3.0 2.4 2.3.2"
+       TIZEN_VERSIONS="7.0"
        QEMU_VERSION=`cat ${SRCDIR}/package/pkginfo.manifest | grep Version | awk -F: '{print $2}' | xargs`
 
        for VER in ${TIZEN_VERSIONS} ; do
-               # emulator
-               EMULATOR_COMMON_DIR=$SRCDIR/package/$VER-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-$VER/common
-               mkdir -p $EMULATOR_COMMON_DIR
-               # we have nothing for common now
 
-               EMULATOR_X86_DIR=$SRCDIR/package/$VER-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-$VER/common
+               EMULATOR_X86_DIR=$SRCDIR/package/$VER-emulator-qemu-x86-whpx.package.${TARGET_OS}/data/platforms/tizen-$VER/common
 
                mkdir -p $EMULATOR_X86_DIR
                cp -pPR $SRCDIR/buildroot_x86_64/tizen/emulator $EMULATOR_X86_DIR/
@@ -76,9 +72,8 @@ install_common()
                        #sed -i'' -e "s/tizen-x.x/tizen-$VER/g" "$TARTGET_INSTALL_FILE"
                fi
 
-               echo "Removing old builds: " $VER-emulator-qemu-x86_${QEMU_VERSION}_${TARGET_OS}.zip
-               rm -f ${SRCDIR}/$VER-emulator-qemu-x86_${QEMU_VERSION}_${TARGET_OS}.zip
-               rm -f ${SRCDIR}/$VER-emulator-qemu-common_${QEMU_VERSION}_${TARGET_OS}.zip
+               echo "Removing old builds: " $VER-emulator-qemu-x86-whpx_${QEMU_VERSION}_${TARGET_OS}.zip
+               rm -f ${SRCDIR}/$VER-emulator-qemu-x86-whpx_${QEMU_VERSION}_${TARGET_OS}.zip
 
        done
 }

diff --git a/package/changelog b/package/changelog
index 307df3eac313945e491c167cfc22c2e2d0a8598b..8a55b895df2b0a707deed95c8de5d07323f02204 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 5.0.1.7
+- Version Up: Make package only for WHPX.
+== Varinder Pratap Singh <varinder.p@samsung.com> 2020-05-07
 * 5.0.1.6
 - Version Up: Added emulator-supplement install dependency and fix .Net and web app launch failure.
 == Varinder Pratap Singh <varinder.p@samsung.com> 2020-05-07

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index c6241d43260e16c590b5c8cefcc52e46bce56abd..23d9e84d2a8a10a723c551c3bc5d3a00ddd5b0e8 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,37 +1,8 @@
-Version: 5.0.1.6
-Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
+Version: 5.0.1.7
+Maintainer: Varinder pratap <varinder.p@samsung.com>
 Source: emulator
 
-# For tizen 7.0
-Package: 7.0-emulator-qemu-common
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Description: Common binaries for Tizen Emulator
-
-Package: 7.0-emulator-qemu-common
-OS: ubuntu-64
-Build-host-os: ubuntu-64
-Description: Common binaries for Tizen Emulator
-
-Package: 7.0-emulator-qemu-common
-OS: windows-32, windows-64
-Build-host-os: ubuntu-64
-Description: Common binaries for Tizen Emulator
-
-Package: 7.0-emulator-qemu-common
-OS: macos-64
-Build-host-os: macos-64
-Description: Common binaries for Tizen Emulator
-
-Package: 7.0-emulator-qemu-x86
-OS: ubuntu-32
-Build-host-os: ubuntu-32
-Build-dependency: 7.0-emulator-lib-dev [ ubuntu-32 ], 7.0-libav-dev [ ubuntu-32 ]
-Install-dependency: 7.0-emulator-kernel-x86 [ ubuntu-32 ], 7.0-libav [ ubuntu-32 ]
-C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
-Description: Tizen x86 Emulator
-
-Package: 7.0-emulator-qemu-x86
+Package: 7.0-emulator-qemu-x86-whpx
 OS: ubuntu-64
 Build-host-os: ubuntu-64
 Build-dependency: 7.0-emulator-lib-dev [ ubuntu-64 ], 7.0-libav-dev [ ubuntu-64]
@@ -39,21 +10,14 @@ Install-dependency: 7.0-emulator-kernel-x86 [ ubuntu-64 ], 7.0-libav [ ubuntu-64
 C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6
 Description: Tizen x86 Emulator
 
-Package: 7.0-emulator-qemu-x86
-OS: windows-32
-Build-host-os: ubuntu-64
-Build-dependency: 7.0-emulator-lib-dev [ windows-32 ], 7.0-libav-dev [ windows-32 ]
-Install-dependency: 7.0-emulator-kernel-x86, 7.0-libav
-Description: Tizen x86 Emulator
-
-Package: 7.0-emulator-qemu-x86
+Package: 7.0-emulator-qemu-x86-whpx
 OS: windows-64
 Build-host-os: ubuntu-64
 Build-dependency: 7.0-emulator-lib-dev [ windows-64 ], 7.0-libav-dev [ windows-64 ]
 Install-dependency: 7.0-emulator-kernel-x86, 7.0-libav, emulator-supplements
 Description: Tizen x86 Emulator
 
-Package: 7.0-emulator-qemu-x86
+Package: 7.0-emulator-qemu-x86-whpx
 OS: macos-64
 Build-host-os: macos-64
 Build-dependency: 7.0-emulator-lib-dev [ macos-64 ], 7.0-libav-dev [ macos-64 ]

diff --git a/test_tizen_emulator.sh b/test_tizen_emulator.sh
index cbc668c4e87b0412ecdb107e422f4a76ce2b9361..5feab94608a96f5928fbc7820465c84a9c73102a 100755 (executable)
--- a/test_tizen_emulator.sh
+++ b/test_tizen_emulator.sh
@@ -5,12 +5,10 @@
 test() 
 {
     TIZEN_PLATFORM_VER="7.0"
-    QEMU_VERSION="5.0.1.5"
+    QEMU_VERSION="5.0.1.7"
     BUILD_TARGET="ubuntu-64"
-    # emulator
-    EMULATOR_COMMON_DIR=./package/$TIZEN_PLATFORM_VER-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-$TIZEN_PLATFORM_VER/common
     # we have nothing for common now
-    EMULATOR_X86_DIR=./package/$TIZEN_PLATFORM_VER-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-$TIZEN_PLATFORM_VER/common
+    EMULATOR_X86_DIR=./package/$TIZEN_PLATFORM_VER-emulator-qemu-x86-whpx.package.${TARGET_OS}/data/platforms/tizen-$TIZEN_PLATFORM_VER/common
     mkdir -p ./tizen_test_binaries/
 
     UNZIP_PATH=`which unzip`
@@ -20,7 +18,7 @@ test()
         exit
     fi
 
-    $UNZIP_PATH $TIZEN_PLATFORM_VER-emulator-qemu-x86_${QEMU_VERSION}_${BUILD_TARGET}.zip -d ./tizen_test_binaries/
+    $UNZIP_PATH $TIZEN_PLATFORM_VER-emulator-qemu-x86-whpx_${QEMU_VERSION}_${BUILD_TARGET}.zip -d ./tizen_test_binaries/
     # Save orignal emulator.
     cp -pPR $HOME/tizen-studio/platforms/tizen-$TIZEN_PLATFORM_VER/common/emulator $HOME/tizen-studio/platforms/tizen-$TIZEN_PLATFORM_VER/common/emulator_ORGINAL 
     

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index b162ccdfb13ea16c3d1981eb9981b4e56c30fb95..3de6d045ee3fbc0d312d305ca9e2f86d788ab4b3 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -49,7 +49,7 @@ install: all
        mkdir -p $(EMUL_DIR)/images
 
        @echo "Copying emulator binary"
-       cp -pP $(BUILD_PATH)/x86_64-softmmu/qemu-system-x86_64$(EXESUF) $(EMUL_DIR)/bin/emulator-x86_64$(EXESUF)
+       cp -pP $(BUILD_PATH)/x86_64-softmmu/qemu-system-x86_64$(EXESUF) $(EMUL_DIR)/bin/emulator-x86_64-whpx$(EXESUF)
 
        @echo "Copying bioses to $(EMUL_DIR)/data/bios"
        mkdir -p $(EMUL_DIR)/data/bios
@@ -58,9 +58,9 @@ install: all
        cp -pP ../../../pc-bios/linuxboot_dma.bin $(EMUL_DIR)/data/bios
        cp -pP ../../../pc-bios/efi-virtio.rom $(EMUL_DIR)/data/bios
 
-       cp -pP scripts/emulator.sh $(EMUL_DIR)/bin
+       cp -pP scripts/emulator.sh $(EMUL_DIR)/bin/emulator-whpx.sh
 ifdef CONFIG_WIN32
-       cp -pP scripts/emulator.cmd $(EMUL_DIR)/bin
+       cp -pP scripts/emulator.cmd $(EMUL_DIR)/bin/emulator-whpx.cmd
 endif
 
 ifdef CONFIG_QT

diff --git a/tizen/src/scripts/emulator.cmd b/tizen/src/scripts/emulator.cmd
index 5261ac4e12d31aca566c21590fc4e99cb8f14902..cbfc16d32061bfeb6e61a5a3747bc66eaa587627 100644 (file)
--- a/tizen/src/scripts/emulator.cmd
+++ b/tizen/src/scripts/emulator.cmd
@@ -18,7 +18,7 @@ IF "%1"=="--with-gdb" (
 
 rem run emulator
 IF %WITH_GDB%=="yes" (
-       gdb --args "%EMULATOR_BIN_PATH%\emulator-x86_64" %*
+       gdb --args "%EMULATOR_BIN_PATH%\emulator-x86_64-whpx" %*
 ) ELSE (
-       "%EMULATOR_BIN_PATH%\emulator-x86_64" %*
+       "%EMULATOR_BIN_PATH%\emulator-x86_64-whpx" %*
 )

diff --git a/tizen/src/scripts/emulator.sh b/tizen/src/scripts/emulator.sh
index 0e791f7f52571075e06d3d213686449ba83256a3..07a943da7446c426bad4c8593fe7ac4fbdac09f7 100755 (executable)
--- a/tizen/src/scripts/emulator.sh
+++ b/tizen/src/scripts/emulator.sh
@@ -50,7 +50,7 @@ fi
 
 # run emulator
 if [ "$WITH_GDB" = "yes" ]; then
-       gdb --args "$EMULATOR_BIN_PATH/emulator-x86_64" "$@"
+       gdb --args "$EMULATOR_BIN_PATH/emulator-x86_64-whpx" "$@"
 else
-       "$EMULATOR_BIN_PATH/emulator-x86_64" "$@"
+       "$EMULATOR_BIN_PATH/emulator-x86_64-whpx" "$@"
 fi