[Title] Modify build.xml, Makefiles, dibs build scripts to remove swt.jar

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/build.ubuntu-10.04-32 b/package/build.ubuntu-10.04-32
index 1bd7b2d8f2305b963da51c14f258eb6956e8c278..ed9089290c758f86d0f6166e7c54b1da9600bd8b 100755 (executable)
--- a/package/build.ubuntu-10.04-32
+++ b/package/build.ubuntu-10.04-32
@@ -17,7 +17,7 @@ build()
 {
        cd $SRCDIR/tizen/
        ./emulator_configure.sh
-       make
+       make all_dibs
 }
 
 # install
@@ -27,7 +27,7 @@ install()
        mkdir -p $BIN_DIR
 
     cd $SRCDIR/tizen
-    make install
+    make install_dibs
        mv emulator $BIN_DIR
 }
 

diff --git a/package/build.windows-7-32 b/package/build.windows-7-32
index 1312801a32f127a6c32ef63a2f0c93676fa22511..f077e55d0ba0a8fec91e77b9c2755d69806a0ec6 100755 (executable)
--- a/package/build.windows-7-32
+++ b/package/build.windows-7-32
@@ -5,7 +5,7 @@ clean()
 {
        prepare
 
-       cd $SRCDIR/tizen/
+       cd $SRCDIR/tizen
        if test -e "Makefile"
        then
                ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
@@ -38,7 +38,7 @@ prepare()
        export PATH
        export PKG_CONFIG_PATH=$ROOTDIR/lib/pkgconfig
        BUILD_CFLAGS=--extra-cflags=-I$ROOTDIR/include
-    BUILD_LDFLAGS=--extra-ldflags=-L$ROOTDIR/lib
+       BUILD_LDFLAGS=--extra-ldflags=-L$ROOTDIR/lib
 }
 
 # build
@@ -46,22 +46,21 @@ build()
 {
        prepare
 
-       cd $SRCDIR/tizen/
+       cd $SRCDIR/tizen
        ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
-       make
-    if [ -f "../i386-softmmu/qemu-system-i386.exe" ]
-    then
-        echo "BUILD SUCCESS"
-    else
-        echo "BUILD FAIL!!!"
-        exit 1;
-    fi
+       make all_dibs
+       if [ -f "../i386-softmmu/qemu-system-i386.exe" ]
+       then
+               echo "BUILD SUCCESS"
+       else
+               echo "BUILD FAIL!!!"
+               exit 1;
+       fi
 }
 
 # install
 install() 
 {
-
        prepare
 
        BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
@@ -69,7 +68,7 @@ install()
        mkdir -p $BIN_DIR
 
        cd $SRCDIR/tizen
-       make install
+       make install_dibs
        mv emulator $BIN_DIR
 }
 

diff --git a/tizen/Makefile b/tizen/Makefile
index 6c94fd5d9bbed45715e06e2d21dadcca5a9bd20f..09dc639e70e435d56bd7f1ba649196376725767e 100644 (file)
--- a/tizen/Makefile
+++ b/tizen/Makefile
@@ -1,8 +1,14 @@
 all:
-       cd src && $(MAKE)
+       cd src && $(MAKE) all
 clean:
        cd src && $(MAKE) clean
 distclean:
        cd src && $(MAKE) distclean
 install:
        cd src && $(MAKE) install
+
+# for dibs system...
+all_dibs:
+       cd src && $(MAKE) all_dibs
+install_dibs:
+       cd src && $(MAKE) install_dibs

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index bc0286770f1f46e0a88f2dbbbf4765388a15b843..b6184fdc8913985cf15d4aec335027202d7d46e5 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -9,35 +9,30 @@ config-host.mak:
 endif
 
 all: qemu skin_client
+
 qemu: build_info ffmpeg_install check_hax
        cd ../../ && $(MAKE)
 qemu_clean:
        cd ../../ && $(MAKE) clean
 qemu_distclean:
        cd ../../ && $(MAKE) distclean
+
 check_hax:
 ifdef CONFIG_WIN32
        $(CC) -o check-hax.exe check_hax.c
 else
        
 endif
+
 skin_client:
-ifdef CONFIG_WIN32
-       ant -buildfile skin/client/build.xml windows-jar
-else
-ifdef CONFIG_LINUX
-       ant -buildfile skin/client/build.xml linux-jar
-else
-ifdef CONFIG_DARWIN
-       ant -buildfile skin/client/build.xml mac-jar
-endif
-endif
-endif
+       ant -buildfile skin/client/build.xml make-jar
+
 build_info:
        @echo "/* Automatically generated by Makefile - do not modify! */" > build_info.h
        @echo "const char build_version[] = \"`cat VERSION`\";" >> build_info.h
        @echo "const char build_date[] = \"`date +"%F %T %Z"`\";" >> build_info.h
        @echo "const char pkginfo_version[] = \"`sed -n '2p' ./../../package/pkginfo.manifest`\";" >> build_info.h
+
 ffmpeg:
        cd ../distrib/libav/ && $(MAKE)
 ffmpeg_install: ffmpeg
@@ -46,6 +41,7 @@ ffmpeg_clean:
        cd ../distrib/libav/ && $(MAKE) clean
 ffmpeg_distclean:
        cd ../distrib/libav/ && $(MAKE) clean
+
 clean: qemu_clean ffmpeg_clean
 ifdef CONFIG_WIN32
        rm -f check-hax.exe
@@ -53,13 +49,14 @@ else
        
 endif
 distclean: qemu_distclean ffmpeg_distclean
-install: all
+
+install_common: all
        mkdir -p $(EMUL_DIR)/bin
        mkdir -p $(EMUL_DIR)/etc
        mkdir -p $(EMUL_DIR)/x86
-       mkdir -p $(EMUL_DIR)/x86/data 
+       mkdir -p $(EMUL_DIR)/data 
        mkdir -p $(EMUL_DIR)/arm
-       mkdir -p $(EMUL_DIR)/x86/data/pc-bios
+       mkdir -p $(EMUL_DIR)/data/bios
        cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86
        cp skin/client/emulator-skin.jar $(EMUL_DIR)/bin
 ifdef CONFIG_WIN32
@@ -73,3 +70,12 @@ endif
        cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios
        cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios
        cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios
+install: install_common
+       cp skin/client/lib/swt.jar $(EMUL_DIR)/bin/swt.jar
+
+# for dibs system...
+all_dibs: qemu skin_client_dibs
+skin_client_dibs:
+       ant -buildfile skin/client/build.xml -Dclasspath.dibs=$(ROOTDIR)/toos/emulator/bin make-jar-dibs
+install_dibs: install_common
+

diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 71b52a02941a90c00942f052acd7090c1d598829..7e4f6a69a05db2a7eb40289ba5edcdd54e908678 100644 (file)
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" standalone="yes"?>
-<project name="emulator-skin" basedir="." default="linux-jar">
+<project name="emulator-skin" basedir="." default="make-jar">
 
        <property name="jar.file" value="emulator-skin.jar" />
        <property name="mainclass" value="org.tizen.emulator.skin.EmulatorSkinMain" />
 
        <property name="swt.file" value="swt.jar" />
 
-       <path id="linux-classpath">
-               <fileset dir="lib/swt/gtk-linux" includes="swt.jar" />
-       </path>
-       <path id="windows-classpath">
-               <fileset dir="lib/swt/win32-win32" includes="swt.jar" />
-       </path>
-       <path id="mac-classpath">
-               <fileset dir="lib/swt/cocoa-macosx" includes="swt.jar" />
+       <path id="classpath">
+               <fileset dir="lib" includes="${swt.file}" />
        </path>
 
        <target name="clean">
@@ -42,34 +36,20 @@
                </propertyfile>
        </target>
 
-       <target name="linux-compile" depends="make-properties">
-               <echo message="compiling..." />
-        <delete dir="build" />
+       <target name="prepare-compile" depends="make-properties">
+               <echo message="prepare for compile..." />
+               <delete dir="build" />
                <mkdir dir="build" />
-               <javac encoding="UTF-8" fork="true" srcdir="src:jaxb_src" destdir="build" debug="on" memorymaximumsize="128m">
-                       <classpath refid="linux-classpath" />
-               </javac>
        </target>
 
-       <target name="windows-compile" depends="make-properties">
+       <target name="compile" depends="prepare-compile">
                <echo message="compiling..." />
-        <delete dir="build" />
-        <mkdir dir="build" />
                <javac encoding="UTF-8" fork="true" srcdir="src:jaxb_src" destdir="build" debug="on" memorymaximumsize="128m">
-                       <classpath refid="windows-classpath" />
+                       <classpath refid="classpath" />
                </javac>
        </target>
 
-       <target name="mac-compile" depends="make-properties">
-               <echo message="compiling..." />
-        <delete dir="build" />
-        <mkdir dir="build" />
-               <javac encoding="UTF-8" fork="true" srcdir="src:jaxb_src" destdir="build" debug="on" memorymaximumsize="128m">
-                       <classpath refid="mac-classpath" />
-               </javac>
-       </target>
-
-       <target name="linux-jar" depends="linux-compile">
+       <target name="create-jar">
                <echo message="creating jar..." />
                <mkdir dir="build/icons" />
                <copy todir="build/icons">
@@ -79,42 +59,25 @@
                        <fileset file="src/about.properties" />
                        <manifest>
                                <attribute name="Main-Class" value="${mainclass}" />
-                               <attribute name="Class-path" value="lib/swt/gtk-linux/${swt.file}" />
+                               <attribute name="Class-path" value="${swt.file}" />
                        </manifest>
                </jar>
                <delete dir="build" />
        </target>
 
-       <target name="windows-jar" depends="windows-compile">
-        <echo message="creating jar..." />
-        <mkdir dir="build/icons" />
-        <copy todir="build/icons">
-            <fileset dir="resource/icons" />
-        </copy>
-               <jar jarfile="${jar.file}" basedir="build" duplicate="add">
-                       <fileset file="src/about.properties" />
-                       <manifest>
-                               <attribute name="Main-Class" value="${mainclass}" />
-                               <attribute name="Class-path" value="lib/swt/win32-win32/${swt.file}" />
-                       </manifest>
-               </jar>
-               <delete dir="build" />
-       </target>
+       <target name="make-jar" depends="compile, create-jar" />
 
-       <target name="mac-jar" depends="mac-compile">
-        <echo message="creating jar..." />
-        <mkdir dir="build/icons" />
-        <copy todir="build/icons">
-            <fileset dir="resource/icons" />
-        </copy>
-               <jar jarfile="${jar.file}" basedir="build" duplicate="add">
-                       <fileset file="src/about.properties" />
-                       <manifest>
-                               <attribute name="Main-Class" value="${mainclass}" />
-                               <attribute name="Class-path" value="lib/swt/cocoa-macosx/${swt.file}" />
-                       </manifest>
-               </jar>
-               <delete dir="build" />
+       <!-- for dibs system... -->
+       <path id="classpath-dibs">
+               <fileset dir="${classpath.dibs}" includes="${swt.file}" />
+       </path>
+
+       <target name="compile-dibs" depends="prepare-compile">
+               <echo message="compiling..." />
+               <javac encoding="UTF-8" fork="true" srcdir="src:jaxb_src" destdir="build" debug="on" memorymaximumsize="128m">
+                       <classpath refid="classpath-dibs" />
+               </javac>
        </target>
 
-</project>
\ No newline at end of file
+       <target name="make-jar-dibs" depends="compile-dibs, create-jar" />
+</project>