Improve build native activity

tranleduy2000 · tranleduy2000 · commit b69764879952 · 2018-05-30T13:33:12.000+07:00
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/CompileTask.java b/app/src/main/java/com/duy/ccppcompiler/compiler/CompileTask.java
@@ -21,6 +21,7 @@
 import android.support.annotation.Nullable;
 
 import com.duy.ccppcompiler.compiler.compilers.ICompiler;
+import com.duy.ccppcompiler.compiler.manager.ICompileManager;
 import com.duy.ccppcompiler.compiler.shell.CommandResult;
 
 import java.io.File;
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GCCCompiler.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GCCCompiler.java
@@ -78,9 +78,6 @@ protected String buildArgs(File[] sourceFiles) {
         for (File sourceFile : sourceFiles) {
             args.addFlags(sourceFile.getAbsolutePath());
         }
-        if (mSetting != null) {
-            args.addFlags(mSetting.getCFlags());
-        }
 
         if (mBuildNativeActivity) {
             if (DLog.DEBUG) DLog.d(TAG, "buildArgs: build native activity");
@@ -105,9 +102,10 @@ protected String buildArgs(File[] sourceFiles) {
             args.addFlags("-o", mOutFile.getAbsolutePath());
         }
 
-//        if (Build.VERSION.SDK_INT >= 21) {
-//            args.addFlags("-pie");
-//        }
+        if (mSetting != null) {
+            args.addFlags(mSetting.getCFlags());
+            args.addFlags(mSetting.getLinkerFlags());
+        }
 
         return args.build();
     }
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GPlusPlusCompiler.java b/app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GPlusPlusCompiler.java
@@ -17,7 +17,6 @@
 package com.duy.ccppcompiler.compiler.compilers;
 
 import android.content.Context;
-import android.os.Build;
 
 import com.duy.ccppcompiler.compiler.ICompileSetting;
 import com.duy.ccppcompiler.compiler.shell.CommandBuilder;
@@ -56,10 +55,6 @@ protected String buildArgs(File[] sourceFiles) {
         for (File sourceFile : sourceFiles) {
             args.addFlags(sourceFile.getAbsolutePath());
         }
-        if (mSetting != null) {
-            args.addFlags(mSetting.getCxxFlags());
-        }
-
         if (mBuildNativeActivity) {
             mOutFile = new File(source.getParent(), "lib" + nameNoExt + ".so");
             String cCtoolsDir = Environment.getCCtoolsDir(mContext);
@@ -77,8 +72,9 @@ protected String buildArgs(File[] sourceFiles) {
             args.addFlags("-o", mOutFile.getAbsolutePath());
         }
 
-        if (Build.VERSION.SDK_INT >= 21) {
-            args.addFlags("-pie");
+        if (mSetting != null) {
+            args.addFlags(mSetting.getCFlags());
+            args.addFlags(mSetting.getLinkerFlags());
         }
 
         return args.build();
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/manager/CompileManager.java b/app/src/main/java/com/duy/ccppcompiler/compiler/manager/CompileManager.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2018 Mr Duy
+ *  Copyright (C)  2018  Duy Tran Le
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.duy.ccppcompiler.compiler;
+package com.duy.ccppcompiler.compiler.manager;
 
 import android.app.NativeActivity;
 import android.content.Intent;
@@ -34,6 +35,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * Created by Duy on 25-Apr-18.
@@ -57,15 +59,8 @@ public void onCompileSuccess(CommandResult result) {
 
             //copy to internal storage
             try {
-                internalBinary = new File(Environment.getTmpExeDir(getActivity()), binFile.getName());
-                FileInputStream inputStream = new FileInputStream(binFile);
-                FileOutputStream outputStream = new FileOutputStream(internalBinary);
-                IOUtils.copy(inputStream, outputStream);
-                inputStream.close();
-                outputStream.close();
-
-                //set executable
-                Utils.chmod(internalBinary.getAbsolutePath(), 0x1ed/*0775*/);
+                internalBinary = copyToTmpExeDirAndSetExecutable(binFile);
+
             } catch (Exception e) {
                 e.printStackTrace();
                 Toast.makeText(getActivity(), String.format("Internal error: %s. Please report bug on GitHub",
@@ -90,4 +85,18 @@ public void onCompileSuccess(CommandResult result) {
         }
     }
 
+    protected File copyToTmpExeDirAndSetExecutable(File binFile) throws IOException {
+        File internalBinary = new File(Environment.getTmpExeDir(getActivity()), binFile.getName());
+        FileInputStream inputStream = new FileInputStream(binFile);
+        FileOutputStream outputStream = new FileOutputStream(internalBinary);
+        IOUtils.copy(inputStream, outputStream);
+        inputStream.close();
+        outputStream.close();
+
+        //set executable
+        Utils.chmod(internalBinary.getAbsolutePath(), 0x1ed/*0775*/);
+
+        return internalBinary;
+    }
+
 }
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/manager/CompileManagerImpl.java b/app/src/main/java/com/duy/ccppcompiler/compiler/manager/CompileManagerImpl.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2018 Mr Duy
+ *  Copyright (C)  2018  Duy Tran Le
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.duy.ccppcompiler.compiler;
+package com.duy.ccppcompiler.compiler.manager;
 
 import android.app.ProgressDialog;
 import android.support.annotation.MainThread;
@@ -23,6 +24,7 @@
 import android.widget.Toast;
 
 import com.duy.ccppcompiler.R;
+import com.duy.ccppcompiler.compiler.CompileTask;
 import com.duy.ccppcompiler.compiler.compilers.ICompiler;
 import com.duy.ccppcompiler.compiler.shell.CommandResult;
 import com.duy.ccppcompiler.compiler.shell.OutputParser;
@@ -32,6 +34,7 @@
 import com.duy.ide.DiagnosticPresenter;
 import com.duy.ide.DiagnosticsCollector;
 import com.duy.ide.editor.SimpleEditorActivity;
+import com.jecelyin.common.utils.UIUtils;
 import com.jecelyin.editor.v2.widget.menu.MenuDef;
 
 import java.io.File;
@@ -101,6 +104,14 @@ public void onCompileSuccess(CommandResult commandResult) {
         finishCompile(commandResult);
     }
 
+    @MainThread
+    protected void handleException(Throwable e) {
+        if (e == null) {
+            return;
+        }
+        UIUtils.alert(mActivity, e.getMessage());
+    }
+
     private void finishCompile(CommandResult compileResult) {
         hideDialog();
 
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/manager/ICompileManager.java b/app/src/main/java/com/duy/ccppcompiler/compiler/manager/ICompileManager.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2018 Mr Duy
+ *  Copyright (C)  2018  Duy Tran Le
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.duy.ccppcompiler.compiler;
+package com.duy.ccppcompiler.compiler.manager;
 
 import android.support.annotation.MainThread;
 
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/manager/NativeActivityCompileManager.java b/app/src/main/java/com/duy/ccppcompiler/compiler/manager/NativeActivityCompileManager.java
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (C)  2018  Duy Tran Le
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.duy.ccppcompiler.compiler.manager;
+
+import android.app.NativeActivity;
+import android.content.Intent;
+
+import com.duy.ccppcompiler.compiler.shell.CommandResult;
+import com.duy.ccppcompiler.compiler.shell.NativeActivityCompileResult;
+import com.duy.editor.CodeEditorActivity;
+
+import java.io.File;
+import java.io.IOException;
+
+public class NativeActivityCompileManager extends CompileManager {
+
+    public NativeActivityCompileManager(CodeEditorActivity activity) {
+        super(activity);
+    }
+
+    @Override
+    public void onCompileSuccess(CommandResult result) {
+        super.onCompileSuccess(result);
+
+        if (result instanceof NativeActivityCompileResult) {
+            File internalBinary;
+            try {
+                NativeActivityCompileResult compileResult = (NativeActivityCompileResult) result;
+                internalBinary = copyToTmpExeDirAndSetExecutable(compileResult.getBinaryFile());
+            } catch (IOException e) {
+                handleException(e);
+                return;
+            }
+
+            //now run binary file
+            Intent intent = new Intent(getActivity(), NativeActivity.class);
+            //from jni: main.cpp
+            intent.putExtra("nativeApp", internalBinary.getAbsolutePath());
+            getActivity().startActivity(intent);
+        } else {
+            super.onCompileSuccess(result);
+        }
+    }
+}
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/manager/SDLCompileManager.java b/app/src/main/java/com/duy/ccppcompiler/compiler/manager/SDLCompileManager.java
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C)  2018  Duy Tran Le
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.duy.ccppcompiler.compiler.manager;
+
+import android.content.Intent;
+
+import com.duy.ccppcompiler.compiler.shell.CommandResult;
+import com.duy.ccppcompiler.compiler.shell.CompileResult;
+import com.duy.editor.CodeEditorActivity;
+import com.jecelyin.common.utils.UIUtils;
+
+import java.io.File;
+
+public class SDLCompileManager extends CompileManager {
+
+    public SDLCompileManager(CodeEditorActivity activity) {
+        super(activity);
+    }
+
+    @Override
+    public void onCompileSuccess(CommandResult result) {
+        if (result instanceof CompileResult) {
+            File binaryFile = ((CompileResult) result).getBinaryFile();
+            if (binaryFile == null) {
+                super.onCompileSuccess(result);
+                return;
+            }
+
+            Intent intent = getActivity().getPackageManager().getLaunchIntentForPackage("com.duy.c.cpp.compiler.sdlplugin");
+            if (intent != null) {
+                intent.putExtra("sdlmain", binaryFile.getAbsolutePath());
+                getActivity().startActivity(intent);//null pointer check in case package name was not found
+            } else {
+                UIUtils.alert(getActivity(), "Can not run SDL application");
+            }
+        } else {
+            super.onCompileSuccess(result);
+        }
+    }
+}
diff --git a/app/src/main/java/com/duy/ccppcompiler/compiler/shell/NativeActivityCompileResult.java b/app/src/main/java/com/duy/ccppcompiler/compiler/shell/NativeActivityCompileResult.java
@@ -1,12 +1,33 @@
 package com.duy.ccppcompiler.compiler.shell;
 
+import android.support.annotation.Nullable;
+
+import java.io.File;
+
 /**
  * Compile result when build native activity
  */
 public class NativeActivityCompileResult extends CompileResult {
+    @Nullable
+    private File binaryFile;
 
     public NativeActivityCompileResult(CommandResult commandResult) {
         super(commandResult);
     }
 
+    @Nullable
+    public File getBinaryFile() {
+        return binaryFile;
+    }
+
+    public void setBinaryFile(@Nullable File binaryFile) {
+        this.binaryFile = binaryFile;
+    }
+
+    @Override
+    public String toString() {
+        return "CompileResult{" +
+                "binaryFile=" + binaryFile +
+                "} " + super.toString();
+    }
 }
diff --git a/app/src/main/java/com/duy/ccppcompiler/packagemanager/PackageInstaller.java b/app/src/main/java/com/duy/ccppcompiler/packagemanager/PackageInstaller.java
diff --git a/app/src/main/java/com/duy/editor/CodeEditorActivity.java b/app/src/main/java/com/duy/editor/CodeEditorActivity.java
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/editor/src/main/java/com/duy/ide/editor/SimpleEditorActivity.java b/editor/src/main/java/com/duy/ide/editor/SimpleEditorActivity.java
