Improved build instructions and added a script to make it easier

to build and install the different remote desktop clients.
iiordanov · Apr 29, 2017 · 4201b1c · 4201b1c
1 parent b1844f1
commit 4201b1c
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 23 deletions.
diff --git a/BUILDING b/BUILDING
@@ -88,24 +88,30 @@
 
    - Are referenced in Properties -> Project References (put checkmarks on projects).
 
-7a. To build bVNC, just use the IDE to deploy the project to your device, etc.
+7a. To build bVNC
 
-7b. To build aSPICE, you need to:
-   - cd bVNC/eclipse_projects/bVNC
-   - cp AndroidManifest.xml.aspice AndroidManifest.xml
+   - Run:
+     cd bVNC/eclipse_projects/bVNC
+     ./prepare_project.sh bVNC
+
+   - Follow the instructions that the script outputs.
+
+7b. To build aSPICE
 
    - Recompile with:
+     cd bVNC/eclipse_projects/bVNC
      ndk-build -j 12
 
-   - You may have to select the "Android private libraries" entry in
-       Project Properties->Java Build Path->Order and Export
-     if you have it.
+   - Run:
+     ./prepare_project.sh aSPICE
 
-   - Clean and rebuild the project.
+   - Follow the instructions that the script outputs.
 
-7c. To build aRDP, you have to successfully build the FreeRDP library.
-   - cd bVNC/eclipse_projects/bVNC
-   - cp AndroidManifest.xml.ardp AndroidManifest.xml
-   - Clean and rebuild the project.
+7c. To build aRDP
+
+   - Run:
+    cd bVNC/eclipse_projects/bVNC
+    ./prepare_project.sh aRDP
+
+   - Follow the instructions that the script outputs.
 
-Please inform me if (6) needs to be expanded (i.e. if you needed to do anything else in addition to the above.
diff --git a/eclipse_projects/bVNC/.gitignore b/eclipse_projects/bVNC/.gitignore
@@ -9,3 +9,9 @@ libs/armeabi/
 libs/armeabi-v7a
 libs/x86
 gst-build
+src/com/iiordanov/*/AbstractConnectionBean.java
+src/com/iiordanov/*/AbstractMetaKeyBean.java
+src/com/iiordanov/*/MetaList.java
+src/com/iiordanov/*/MostRecentBean.java
+src/com/iiordanov/*/SentTextBean.java
+
diff --git a/eclipse_projects/bVNC/AndroidManifest.xml.aRDP b/eclipse_projects/bVNC/AndroidManifest.xml.aRDP
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.iiordanov.aRDP" android:installLocation="auto"
-          android:versionCode="3920" android:versionName="v3.9.2">
+          android:versionCode="3930" android:versionName="v3.9.3">
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
@@ -19,7 +19,7 @@
         android:smallScreens="true"
         android:anyDensity="true"/>
 
-    <application android:icon="@drawable/icon" android:label="@string/ardp_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
+    <application android:icon="@drawable/icon_ardp" android:label="@string/ardp_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
                 <activity android:label="@string/ardp_app_name"
                           android:name="com.iiordanov.bVNC.aRDP"
                           android:screenOrientation="unspecified"

diff --git a/eclipse_projects/bVNC/AndroidManifest.xml.aSPICE b/eclipse_projects/bVNC/AndroidManifest.xml.aSPICE
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.iiordanov.aSPICE" android:installLocation="auto"
-          android:versionCode="3920" android:versionName="v3.9.2">
+          android:versionCode="3930" android:versionName="v3.9.3">
 
     <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
@@ -19,7 +19,7 @@
         android:smallScreens="true"
         android:anyDensity="true"/>
 
-    <application android:icon="@drawable/icon" android:label="@string/aspice_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
+    <application android:icon="@drawable/icon_aspice" android:label="@string/aspice_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
                 <activity android:label="@string/aspice_app_name"
                           android:name="com.iiordanov.bVNC.aSPICE"
                           android:screenOrientation="unspecified"

diff --git a/eclipse_projects/bVNC/AndroidManifest.xml.bVNC b/eclipse_projects/bVNC/AndroidManifest.xml.bVNC
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.iiordanov.bVNC" android:installLocation="auto"
-          android:versionCode="3920" android:versionName="v3.9.2">
+          android:versionCode="3930" android:versionName="v3.9.3">
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>

diff --git a/eclipse_projects/bVNC/AndroidManifest.xml.freeaRDP b/eclipse_projects/bVNC/AndroidManifest.xml.freeaRDP
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.iiordanov.freeaRDP" android:installLocation="auto"
-          android:versionCode="3920" android:versionName="v3.9.2">
+          android:versionCode="3930" android:versionName="v3.9.3">
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
@@ -19,7 +19,7 @@
         android:smallScreens="true"
         android:anyDensity="true"/>
 
-    <application android:icon="@drawable/icon" android:label="@string/freeardp_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
+    <application android:icon="@drawable/icon_ardp" android:label="@string/freeardp_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
                 <activity android:label="@string/freeardp_app_name"
                           android:name="com.iiordanov.bVNC.aRDP"
                           android:screenOrientation="unspecified"

diff --git a/eclipse_projects/bVNC/AndroidManifest.xml.freeaSPICE b/eclipse_projects/bVNC/AndroidManifest.xml.freeaSPICE
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.iiordanov.freeaSPICE" android:installLocation="auto"
-          android:versionCode="3920" android:versionName="v3.9.2">
+          android:versionCode="3930" android:versionName="v3.9.3">
 
     <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="12"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
@@ -19,7 +19,7 @@
         android:smallScreens="true"
         android:anyDensity="true"/>
 
-    <application android:icon="@drawable/icon" android:label="@string/freeaspice_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
+    <application android:icon="@drawable/icon_aspice" android:label="@string/freeaspice_app_name" android:allowBackup="false" android:debuggable="false" android:theme="@style/AppTheme" android:name="com.iiordanov.bVNC.App">
                 <activity android:label="@string/freeaspice_app_name"
                           android:name="com.iiordanov.bVNC.aSPICE"
                           android:screenOrientation="unspecified"

diff --git a/eclipse_projects/bVNC/AndroidManifest.xml.freebVNC b/eclipse_projects/bVNC/AndroidManifest.xml.freebVNC
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.iiordanov.freebVNC" android:installLocation="auto"
-          android:versionCode="3920" android:versionName="v3.9.2">
+          android:versionCode="3930" android:versionName="v3.9.3">
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>

diff --git a/eclipse_projects/bVNC/prepare_project.sh b/eclipse_projects/bVNC/prepare_project.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+usage () {
+  echo "$0 bVNC|freebVNC|aSPICE|freeaSPICE|aRDP|freeaRDP"
+  exit 1
+}
+
+PRJ="$1"
+
+if [ "$PRJ" != "bVNC" -a "$PRJ" != "freebVNC" \
+  -a "$PRJ" != "aSPICE" -a "$PRJ" != "freeaSPICE" \
+  -a "$PRJ" != "aRDP" -a "$PRJ" != "freeaRDP" ]
+then
+  usage
+fi
+
+ln -sf AndroidManifest.xml.$PRJ AndroidManifest.xml
+
+generated_files="AbstractConnectionBean.java AbstractMetaKeyBean.java MetaList.java MostRecentBean.java SentTextBean.java"
+for f in $generated_files
+do
+  rm -f src/com/iiordanov/*/$f
+done
+
+echo
+echo "Now please switch to your IDE, select the bVNC project, refresh with F5,"
+echo "clean and rebuild it to auto-generate the DAO objects with sqlitegen."
+echo
+echo "You must have sqlitegen installed as per the BUILDING file."
+echo
+echo "When the build in your IDE completes, switch back to this terminal and"
+echo "press ENTER key for this script to continue executing."
+echo
+read CONTINUE
+
+generated_files="AbstractConnectionBean.java AbstractMetaKeyBean.java MetaList.java MostRecentBean.java SentTextBean.java"
+
+for f in $generated_files
+do
+  file=gen/com/iiordanov/$PRJ/$f
+  if [ ! -f $file ]
+  then
+    echo "Could not find auto-generated file $file. Please try cleaning / rebuilding the project, and make sure sqlitegen is installed properly."
+    echo
+    exit 2
+  else
+    echo "Moving $f to src/com/iiordanov/$PRJ"
+    mv $file src/com/iiordanov/$PRJ/
+  fi
+done
+
+echo
+echo "Now you can go back to your IDE and install $PRJ to your device, etc."
+echo