[Title] Fix compilation failure if there is no git

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

diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 41e9533..00a8490 100644 (file)
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -30,7 +30,8 @@
                <exec executable="cat" outputproperty="version">
                        <arg value="../../VERSION" />
                </exec>
-               <exec executable="git" outputproperty="build_git_commit">
+               <property name="build_git_commit" value="Not identified" />
+               <exec executable="git" outputproperty="build_git_commit" failifexecutionfails="false">
                        <arg value="rev-parse" />
                        <arg value="--short" />
                        <arg value="HEAD" />
@@ -82,6 +83,7 @@
     <target name="windows-jar" depends="windows-compile">
         <echo message="creating jar..." />
         <jar jarfile="${jar.file}" basedir="bin" 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}"/>
@@ -92,6 +94,7 @@
     <target name="mac-jar" depends="mac-compile">
         <echo message="creating jar..." />
         <jar jarfile="${jar.file}" basedir="bin" 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}"/>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
index 81da445..683823a 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java
@@ -12,14 +12,16 @@ public class AboutDialog {
        Properties properties;
        
        public AboutDialog(Shell shell) {
-               if(!getProperties())
-                       return;
-               
                messageBox = new MessageBox(shell);
                messageBox.setText("About");
                
-               String message = makeMessage();
-               messageBox.setMessage(message);
+               if(getProperties()) {
+                       String message = makeMessage();
+                       messageBox.setMessage(message);
+               }
+               else {
+                       messageBox.setMessage("No version information");
+               }
        }
 
        private String makeMessage() {