Merge branch 'master' of https://github.com/ClnViewer/Code-Blocks-Android-NDK

Author: ClnViewer

.gitignore

@@ -7,10 +7,7 @@
 *.sh
 /bin
 /obj
-_git-commit.sh
-_svn-commit.sh
-_svn-update.sh
-_svn-init.sh
+*.sh
 
 # Prerequisites
 *.d

CB-Template/templates/wizard/ndk_android/files/Makefile renamed to CB-Template/CodeBlocks/templates/wizard/ndk_android/files/Makefile

@@ -42,6 +42,7 @@ PLATFORM_OPTIM  :=
 
 # Variables local
 
+DIR_UTILS    := $(SC_BIN_PATH)
 DIR_NDKROOT  := $(SC_NDK_DIR)
 DIR_PROJECT  := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 STR_BUILDTAG := $(filter-out $@,$(MAKECMDGOALS))
@@ -76,13 +77,8 @@ cleanRelease: setndk clean
 cleanall: setndk clean
 
 setndk:
-	@echo '==== SET NDK -> $(SC_NDK_API) -> $(SC_NDK_ABI) -> active device: [ $(PLATFORM_ABI) ] ===='
-	@echo "APP_STL := $(PLATFORM_STL)" >Application.mk
-	@echo "APP_ABI := $(SC_NDK_ABI)" >>Application.mk
-	@echo "APP_PLATFORM := $(SC_NDK_API)" >>Application.mk
-	@echo "APP_BUILD_SCRIPT := $(PLATFORM_SCRIPT)" >>Application.mk
-	@echo "APP_OPTIM := $(PLATFORM_OPTIM)" >>Application.mk
-	@cbp2ndk.exe $(STR_BUILDTAG) $(DIR_CONFCBP)
+	@echo '==== SET C::B NDK -> $(SC_NDK_API) -> $(SC_NDK_ABI) -> active device: [ $(PLATFORM_ABI) ] ===='
+	@$(DIR_UTILS)/exec/cbp2ndk32.exe -t $(STR_BUILDTAG) -c $(DIR_CONFCBP) --api $(PLATFORM_API) --abi $(PLATFORM_ABI) --ndkopt $(PLATFORM_OPTIM)
 -include $(PLATFORM_SCRIPT)
 
 buildndk:
@@ -96,7 +92,7 @@ clean:
 
 adbsetup:
 	@echo '==== ADB SETUP: [ $(PLATFORM_ABI) ] ===='
-	Cmd.exe /C android-elf-cleaner.exe $(DIR_PROJECT)libs\$(PLATFORM_ABI)\$(LOCAL_MODULE)
+	Cmd.exe /C $(DIR_UTILS)/exec/android-elf-cleaner32.exe $(DIR_PROJECT)libs\$(PLATFORM_ABI)\$(LOCAL_MODULE)
 	Cmd.exe /C adb.exe push $(DIR_PROJECT)libs\$(PLATFORM_ABI)\$(LOCAL_MODULE) /data/local/tmp/$(LOCAL_MODULE)
 	Cmd.exe /C adb.exe shell /system/bin/chmod 0777 /data/local/tmp/$(LOCAL_MODULE)
 

CB-Template/templates/wizard/ndk_android/files/main.cpp renamed to CB-Template/CodeBlocks/templates/wizard/ndk_android/files/main.cpp

@@ -137,14 +137,22 @@ function GetFilesDir()
 // setup the already created project
 function SetupProject(project)
 {
+    local util_path = Wizard.FindTemplateFile(_T("ndk_android"));
+    if (util_path.IsEmpty())
+    {
+	ShowWarning(_T("No binary utilites found, install cbp2ndk32.exe and android-elf-cleaner32.exe!"));
+        return false;
+    }
+
     project.SetVar(_T("NDK_API"),  str_BinApi, false);
     project.SetVar(_T("NDK_ABI"),  str_BinAbi, false);
     project.SetVar(_T("NDK_DIR"),  str_NdkPath, false);
     project.SetVar(_T("AOSP_DIR"), str_AospPath, false);
+    project.SetVar(_T("UTIL_DIR"), util_path + _T("/exec"), false);
 
     // Project make & prebuild commands
-    local pb_cleanbin = _T("android-elf-cleaner.exe $(PROJECT_DIR)libs/") + str_BinAbi +  _T("/$(TARGET_OUTPUT_BASENAME)");
-    local mk_variable = _T("SC_NDK_API=\"") + str_BinApi + _T("\" SC_NDK_ABI=\"") + str_BinAbi + _T("\" SC_NDK_DIR=\"") + str_NdkPath  + _T("\"");
+    local pb_cleanbin = util_path + _T("/exec/android-elf-cleaner32.exe $(PROJECT_DIR)libs/") + str_BinAbi +  _T("/$(TARGET_OUTPUT_BASENAME)");
+    local mk_variable = _T("SC_BIN_PATH=\"") + util_path + _T("\" SC_NDK_API=\"") + str_BinApi + _T("\" SC_NDK_ABI=\"") + str_BinAbi + _T("\" SC_NDK_DIR=\"") + str_NdkPath  + _T("\"");
     if (!str_AospPath.IsEmpty())
     {
 	mk_variable += _T(" SC_AOSP_DIR=\"") + str_AospPath + _T("\"");
@@ -164,7 +172,6 @@ function SetupProject(project)
     project.AddCompilerOption(_T("-Wno-unknown-pragmas"));
     project.AddCompilerOption(_T("-fexceptions"));
     project.AddCompilerOption(_T("-D__ANDROID_API_PLATFORM__=\"$(TARGET_PLATFORM)\""));
-
     //project.AddLinkerOption(_T("-llog"));
     //project.CallHooks(true);
 

CB-Template/templates/wizard/ndk_android/logo.png renamed to CB-Template/CodeBlocks/templates/wizard/ndk_android/logo.png

@@ -0,0 +1,87 @@
+; Script generated by the Inno Script Studio Wizard.
+
+#include "..\..\cbp2ndk\version.h"
+
+[Setup]
+AppId={{00A125D3-8122-4ECA-8675-715EE4BF1F82}
+AppName=CodeBlocksNdkTemplate
+AppVersion={#CBP_FULLVERSION_STRING}
+AppVerName="Code::Blocks NDK Template {#CBP_FULLVERSION_STRING}"
+AppPublisher=PS
+AppPublisherURL=https://clnviewer.github.io/Code-Blocks-Android-NDK/
+AppSupportURL=https://clnviewer.github.io/Code-Blocks-Android-NDK/
+AppUpdatesURL=https://clnviewer.github.io/Code-Blocks-Android-NDK/
+ShowLanguageDialog=auto
+CreateAppDir=no
+WizardSmallImageFile=autoinstall_0.bmp
+WizardSmallImageBackColor=clWhite
+WizardImageFile=autoinstall_1.bmp
+WizardImageBackColor=clWhite
+OutputDir=..\..\docs
+OutputBaseFilename=CodeBlocksNdkTemplate
+SetupIconFile=autoinstall.ico
+InfoAfterFile=autoinstall.rtf
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl"
+Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
+Name: "cn"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
+Name: "cnt"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
+Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
+Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
+Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
+Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
+Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+Name: "german"; MessagesFile: "compiler:Languages\German.isl"
+Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
+Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
+Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
+Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
+Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
+Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
+Name: "swedish"; MessagesFile: "compiler:Languages\Swedish.isl"
+Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
+Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
+Name: "korea"; MessagesFile: "compiler:Languages\Korean.isl"
+
+[Files]
+Source: "..\CodeBlocks\*"; Check: GetCodeblocksTemplateDestination; DestDir: "{code:TemplateDestination}"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+[Code]
+
+var cbTemplateDest : String;
+
+function GetCodeblocksTemplateDestination(): Boolean;
+var
+  len:    Integer;
+
+begin
+  cbTemplateDest := '';
+
+  RegQueryStringValue(HKCU, 'SOFTWARE\CodeBlocks', 'Path', cbTemplateDest);
+  len := Length(cbTemplateDest);
+  if len = 0 then
+  begin
+     RegQueryStringValue(HKU, 'SOFTWARE\CodeBlocks', 'Path', cbTemplateDest);
+     len := Length(cbTemplateDest);
+  end;
+  
+  if len > 0 then
+  begin
+    Insert('/share/CodeBlocks/', cbTemplateDest, len + 1);
+  end;
+  Result := len > 0;
+end;
+
+function TemplateDestination(Param: String) : String;
+begin
+   Result := cbTemplateDest;
+end;