build process now non-windows specific
authorAlex Kirhenshtein <alk@netxms.org>
Tue, 10 Apr 2012 15:52:40 +0000 (15:52 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Tue, 10 Apr 2012 15:52:40 +0000 (15:52 +0000)
.gitattributes
.gitignore
android/src/console/.classpath
android/src/console/.externalToolBuilders/Build Number Generator.launch [deleted file]
android/src/console/.externalToolBuilders/Generate build_number.xml from SVN revision.launch [new file with mode: 0644]
android/src/console/.externalToolBuilders/build_number.xml [new file with mode: 0644]
android/src/console/.externalToolBuilders/generate_build_number.xml [new file with mode: 0644]
android/src/console/.project
android/src/console/AndroidManifest.xml
android/src/console/src/org/netxms/ui/android/service/tasks/ConnectTask.java

index fe62749..d6ed971 100644 (file)
@@ -1,6 +1,8 @@
 * text=auto !eol
 android/keystore/keystore -text
-android/src/console/.externalToolBuilders/Build[!!-~]Number[!!-~]Generator.launch -text
+android/src/console/.externalToolBuilders/Generate[!!-~]build_number.xml[!!-~]from[!!-~]SVN[!!-~]revision.launch -text
+android/src/console/.externalToolBuilders/build_number.xml -text
+android/src/console/.externalToolBuilders/generate_build_number.xml -text
 android/src/console/.externalToolBuilders/run.exe -text
 android/src/console/AndroidManifest.xml -text
 android/src/console/default.properties -text
index 9dcec42..628b8f5 100644 (file)
@@ -3,9 +3,11 @@
 /Makefile.in
 /README
 /aclocal.m4
+android/src/console/bin
 android/src/console/gen
 android/src/console/jar/*.jar
 android/src/console/libs/*.jar
+android/src/console/res/values/build_number.xml
 /autom4te.cache
 /bin
 /bin64
index 59132b6..417e749 100644 (file)
@@ -4,8 +4,8 @@
        <classpathentry kind="src" path="gen"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-base-1.1.10.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-client-1.1.10.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-client-api-1.1.10.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-base-1.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-client-1.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-client-api-1.2.0.jar"/>
        <classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/android/src/console/.externalToolBuilders/Build Number Generator.launch b/android/src/console/.externalToolBuilders/Build Number Generator.launch
deleted file mode 100644 (file)
index e10a274..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">\r
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/android-console/res/values&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>\r
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/android-console/.externalToolBuilders/run.exe}"/>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="${workspace_loc:/android-console/.externalToolBuilders/generate_build.pl}"/>\r
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/android-console/res/values}"/>\r
-</launchConfiguration>\r
diff --git a/android/src/console/.externalToolBuilders/Generate build_number.xml from SVN revision.launch b/android/src/console/.externalToolBuilders/Generate build_number.xml from SVN revision.launch
new file mode 100644 (file)
index 0000000..e5457c3
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="android-console"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/android-console/.externalToolBuilders/generate_build_number.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/android-console/.externalToolBuilders}"/>
+</launchConfiguration>
diff --git a/android/src/console/.externalToolBuilders/build_number.xml b/android/src/console/.externalToolBuilders/build_number.xml
new file mode 100644 (file)
index 0000000..b8a19a9
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+       <string name="build_number">@revision@</string>
+</resources>
diff --git a/android/src/console/.externalToolBuilders/generate_build_number.xml b/android/src/console/.externalToolBuilders/generate_build_number.xml
new file mode 100644 (file)
index 0000000..9174e31
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Build Script" default="make" basedir=".">
+    <target name="make">
+        <!-- Get current working directory. -->
+        <exec executable="pwd" outputproperty="dir.root" />
+        <!-- Get subversion revision number. -->
+        <exec executable="svnversion" outputproperty="repository.revision" />
+        <echo message="Repository revision is ${repository.revision}" />
+
+               <copy overwrite="true" file="build_number.xml" toFile="../res/values/build_number.xml">
+                       <filterset>
+                               <filter token="revision" value="${repository.revision}" />
+                       </filterset>
+               </copy>
+    </target>
+</project>
index 95a4205..dc95d28 100644 (file)
@@ -5,16 +5,6 @@
        <projects>
        </projects>
        <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-                       <triggers>full,incremental,</triggers>
-                       <arguments>
-                               <dictionary>
-                                       <key>LaunchConfigHandle</key>
-                                       <value>&lt;project&gt;/.externalToolBuilders/Build Number Generator.launch</value>
-                               </dictionary>
-                       </arguments>
-               </buildCommand>
                <buildCommand>
                        <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
                        <arguments>
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+                       <triggers>full,incremental,</triggers>
+                       <arguments>
+                               <dictionary>
+                                       <key>LaunchConfigHandle</key>
+                                       <value>&lt;project&gt;/.externalToolBuilders/Generate build_number.xml from SVN revision.launch</value>
+                               </dictionary>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
index c4ad923..c737c25 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.netxms.ui.android" android:versionName="1.1.10" android:versionCode="2">
+      package="org.netxms.ui.android" android:versionName="1.2.0" android:versionCode="2">
        <uses-sdk android:targetSdkVersion="11" android:minSdkVersion="8"></uses-sdk>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
index 6904483..23e1df5 100644 (file)
@@ -93,7 +93,7 @@ public class ConnectTask extends Thread
                                                session.connect();\r
                                                Log.d(TAG, "calling session.subscribe()");\r
                                                session.subscribe(NXCSession.CHANNEL_ALARMS | NXCSession.CHANNEL_OBJECTS);\r
-                                               service.onConnect(session, session.getAlarms(false));\r
+                                               service.onConnect(session, session.getAlarms());\r
                                                service.loadTools();\r
                                        }\r
                                        catch(Exception e)\r