cleanup

Author: tranleduy2000

.idea/copyright/GNU_GPL_3.xml

@@ -18,34 +18,48 @@
 
 import android.content.Intent;
 
-import com.duy.ccppcompiler.compiler.shell.GccCompileResult;
+import com.duy.ccppcompiler.compiler.shell.CommandResult;
+import com.duy.ccppcompiler.compiler.shell.CompileResult;
+import com.duy.ccppcompiler.compiler.shell.NativeActivityCompileResult;
 import com.duy.ccppcompiler.console.TermActivity;
 import com.duy.editor.CodeEditorActivity;
 import com.pdaxrom.cctools.BuildConstants;
+import com.pdaxrom.cctools.LauncherNativeActivity;
 
 import java.io.File;
 
 /**
  * Created by Duy on 25-Apr-18.
  */
 
-public class CompileManager extends CompileManagerImpl<GccCompileResult> {
+public class CompileManager extends CompileManagerImpl {
 
     public CompileManager(CodeEditorActivity activity) {
         super(activity);
     }
 
     @Override
-    public void onCompileSuccess(GccCompileResult commandResult) {
-        super.onCompileSuccess(commandResult);
-
-        //now run binary file
-        File binFile = commandResult.getBinaryFile();
-        if (binFile != null) {
-            Intent intent = new Intent(mActivity, TermActivity.class);
-            intent.putExtra(BuildConstants.EXTRA_FILE_NAME, binFile.getAbsolutePath());
-            intent.putExtra(BuildConstants.EXTRA_WORK_DIR, binFile.getParent());
-            mActivity.startActivity(intent);
+    public void onCompileSuccess(CommandResult result) {
+        super.onCompileSuccess(result);
+
+        if (result instanceof NativeActivityCompileResult) {
+            //now run binary file
+            File binFile = ((NativeActivityCompileResult) result).getBinaryFile();
+            if (binFile != null) {
+                Intent intent = new Intent(getActivity(), LauncherNativeActivity.class);
+                intent.putExtra(BuildConstants.EXTRA_FILE_NAME, binFile.getAbsolutePath());
+                intent.putExtra(BuildConstants.EXTRA_WORK_DIR, binFile.getParent());
+                mActivity.startActivity(intent);
+            }
+
+        } else if (result instanceof CompileResult) {
+            File binFile = ((CompileResult) result).getBinaryFile();
+            if (binFile != null) {
+                Intent intent = new Intent(getActivity(), TermActivity.class);
+                intent.putExtra(BuildConstants.EXTRA_FILE_NAME, binFile.getAbsolutePath());
+                intent.putExtra(BuildConstants.EXTRA_WORK_DIR, binFile.getParent());
+                mActivity.startActivity(intent);
+            }
         }
     }
 

.idea/copyright/profiles_settings.xml

@@ -25,12 +25,12 @@
 import com.duy.ccppcompiler.R;
 import com.duy.ccppcompiler.compiler.compilers.ICompiler;
 import com.duy.ccppcompiler.compiler.shell.CommandResult;
-import com.duy.ide.Diagnostic;
-import com.duy.ide.DiagnosticPresenter;
-import com.duy.ide.DiagnosticsCollector;
 import com.duy.ccppcompiler.compiler.shell.OutputParser;
 import com.duy.common.DLog;
 import com.duy.editor.CodeEditorActivity;
+import com.duy.ide.Diagnostic;
+import com.duy.ide.DiagnosticPresenter;
+import com.duy.ide.DiagnosticsCollector;
 import com.duy.ide.editor.SimpleEditorActivity;
 import com.jecelyin.editor.v2.widget.menu.MenuDef;
 
@@ -40,10 +40,10 @@
 /**
  * Created by Duy on 18-May-18.
  */
-public abstract class CompileManagerImpl<T extends CommandResult> implements ICompileManager<T> {
+public abstract class CompileManagerImpl implements ICompileManager {
     private static final String TAG = "CompileManager";
     @NonNull
-    protected SimpleEditorActivity mActivity;
+    SimpleEditorActivity mActivity;
     @Nullable
     private ProgressDialog mCompileDialog;
     @Nullable
@@ -84,27 +84,24 @@ public void onNewMessage(CharSequence charSequence) {
     }
 
     @Override
-    public void onCompileFailed(T commandResult) {
-        finishCompile(commandResult);
+    public void onCompileFailed(CommandResult compileResult) {
+        finishCompile(compileResult);
 
         if (mDiagnosticPresenter != null) {
             mDiagnosticPresenter.expandView();
         }
 
         Toast.makeText(mActivity, "Compiled failed", Toast.LENGTH_LONG).show();
-        if (DLog.DEBUG) DLog.w(TAG, "onCompileFailed: \n" + commandResult.getMessage());
+        if (DLog.DEBUG) DLog.w(TAG, "onCompileFailed: \n" + compileResult.getMessage());
     }
 
     @Override
-    public void onCompileSuccess(T commandResult) {
+    public void onCompileSuccess(CommandResult commandResult) {
+        if (DLog.DEBUG) DLog.d(TAG, "onCompileSuccess() commandResult = [" + commandResult + "]");
         finishCompile(commandResult);
     }
 
-    public void setDiagnosticPresenter(DiagnosticPresenter diagnosticPresenter) {
-        this.mDiagnosticPresenter = diagnosticPresenter;
-    }
-
-    private void finishCompile(T commandResult) {
+    private void finishCompile(CommandResult compileResult) {
         hideDialog();
 
         mActivity.setMenuStatus(R.id.action_run, MenuDef.STATUS_NORMAL);
@@ -113,11 +110,11 @@ private void finishCompile(T commandResult) {
         if (mDiagnosticPresenter != null) {
             DiagnosticsCollector diagnosticsCollector = new DiagnosticsCollector();
             OutputParser parser = new OutputParser(diagnosticsCollector);
-            parser.parse(commandResult.getMessage());
+            parser.parse(compileResult.getMessage());
 
             ArrayList<Diagnostic> diagnostics = diagnosticsCollector.getDiagnostics();
             mDiagnosticPresenter.setDiagnostics(diagnostics);
-            mDiagnosticPresenter.log(commandResult.getMessage());
+            mDiagnosticPresenter.log(compileResult.getMessage());
         }
     }
 
@@ -128,7 +125,16 @@ private void hideDialog() {
         }
     }
 
+    public void setDiagnosticPresenter(DiagnosticPresenter diagnosticPresenter) {
+        this.mDiagnosticPresenter = diagnosticPresenter;
+    }
+
     public void setCompiler(ICompiler compiler) {
         this.mCompiler = compiler;
     }
+
+    @NonNull
+    public SimpleEditorActivity getActivity() {
+        return mActivity;
+    }
 }

app/src/main/java/com/duy/ccppcompiler/compiler/CompileManager.java

@@ -22,7 +22,6 @@
 
 import com.duy.ccppcompiler.compiler.compilers.ICompiler;
 import com.duy.ccppcompiler.compiler.shell.CommandResult;
-import com.duy.common.DLog;
 
 import java.io.File;
 
@@ -63,8 +62,6 @@ protected CommandResult doInBackground(Void... voids) {
     @Override
     protected void onPostExecute(CommandResult commandResult) {
         super.onPostExecute(commandResult);
-        if (DLog.DEBUG)
-            DLog.d(TAG, "onPostExecute() called with: shellResult = [" + commandResult + "]");
         if (mCompileManager == null) {
             return;
         }

app/src/main/java/com/duy/ccppcompiler/compiler/CompileManagerImpl.java

@@ -26,7 +26,7 @@
  * Created by Duy on 25-Apr-18.
  */
 
-public interface ICompileManager<T extends CommandResult> {
+public interface ICompileManager {
     @MainThread
     void onNewMessage(CharSequence charSequence);
 
@@ -47,12 +47,12 @@ public interface ICompileManager<T extends CommandResult> {
      * This method will be call when compile success
      */
     @MainThread
-    void onCompileSuccess(T commandResult);
+    void onCompileSuccess(CommandResult compileResult);
 
     /**
      * This method will be call when compile failed with error
      */
     @MainThread
-    void onCompileFailed(T commandResult);
+    void onCompileFailed(CommandResult compileResult);
 
 }

app/src/main/java/com/duy/ccppcompiler/compiler/CompileTask.java

@@ -1,17 +1,18 @@
 /*
- * 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.compilers;

app/src/main/java/com/duy/ccppcompiler/compiler/ICompileManager.java

@@ -22,7 +22,7 @@
 
 import com.duy.ccppcompiler.compiler.ICompileSetting;
 import com.duy.ccppcompiler.compiler.shell.CommandBuilder;
-import com.duy.ccppcompiler.compiler.shell.GccCompileResult;
+import com.duy.ccppcompiler.compiler.shell.CompileResult;
 import com.duy.ccppcompiler.packagemanager.Environment;
 import com.pdaxrom.utils.Utils;
 
@@ -40,10 +40,9 @@ public class GCCCompiler extends CompilerImpl {
     private static final String TAG = "GCCCompiler";
     private static final String GCC_COMPILER_NAME = "gcc-4.9";
 
-    protected File mOutFile;
-    protected ICompileSetting mSetting;
-
-    private boolean mBuildNativeActivity;
+    File mOutFile;
+    ICompileSetting mSetting;
+    boolean mBuildNativeActivity;
 
     public GCCCompiler(Context context, boolean nativeActivity, @Nullable ICompileSetting setting) {
         super(context);
@@ -52,8 +51,8 @@ public GCCCompiler(Context context, boolean nativeActivity, @Nullable ICompileSe
     }
 
     @Override
-    public GccCompileResult compile(File[] sourceFiles) {
-        GccCompileResult result = new GccCompileResult(super.compile(sourceFiles));
+    public CompileResult compile(File[] sourceFiles) {
+        CompileResult result = new CompileResult(super.compile(sourceFiles));
         if (result.getResultCode() == RESULT_NO_ERROR) {
             if (mOutFile != null && mOutFile.exists()) {
                 try {
@@ -99,17 +98,19 @@ protected String buildArgs(File[] sourceFiles) {
         }
 
         if (mBuildNativeActivity) {
-            mOutFile = new File(source.getParent(), "lib" + nameNoExt + ".so");
+            String outFile = nameNoExt;
+//            mOutFile = new File(source.getParent(), "lib" + nameNoExt + ".so");
+            outFile = "lib" + outFile + ".so";
             String cCtoolsDir = Environment.getCCtoolsDir(mContext);
             args.addFlags(String.format("-I%s/sources/native_app_glue", cCtoolsDir))
                     .addFlags(String.format("%s/sources/native_app_glue/android_native_app_glue.c", cCtoolsDir))
-                    .addFlags(String.format("-Wl,-soname,%s", mOutFile.getAbsolutePath()))
+                    .addFlags(String.format("-Wl,-soname,%s", outFile))
                     .addFlags("-shared")
                     .addFlags("-Wl,--no-undefined -Wl,-z,noexecstack")
                     .addFlags("-llog")
                     .addFlags("-landroid")
                     .addFlags("-lm")
-                    .addFlags("-o", mOutFile.getAbsolutePath());
+                    .addFlags("-o", outFile);
         } else {
             mOutFile = new File(source.getParent(), nameNoExt);
             args.addFlags("-o", mOutFile.getAbsolutePath());

app/src/main/java/com/duy/ccppcompiler/compiler/compilers/CompilerImpl.java

@@ -17,8 +17,13 @@
 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;
+import com.duy.ccppcompiler.packagemanager.Environment;
+
+import java.io.File;
 
 /**
  * G++ compiler as GCC compiler but it different name, just override {@link #getCompilerProgram()}
@@ -35,4 +40,41 @@ public GPlusPlusCompiler(Context context, boolean nativeActivity, ICompileSettin
     protected String getCompilerProgram() {
         return G_PLUS_PLUS_COMPILER_NAME;
     }
+
+    @Override
+    protected String buildArgs(File[] sourceFiles) {
+        File source = sourceFiles[0];
+        String nameNoExt = source.getName().substring(0, source.getName().lastIndexOf("."));
+
+        CommandBuilder args = new CommandBuilder();
+        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);
+            args.addFlags(String.format("-I%s/sources/native_app_glue", cCtoolsDir))
+                    .addFlags(String.format("%s/sources/native_app_glue/android_native_app_glue.c", cCtoolsDir))
+                    .addFlags(String.format("-Wl,-soname,%s", mOutFile.getAbsolutePath()))
+                    .addFlags("-shared")
+                    .addFlags("-Wl,--no-undefined -Wl,-z,noexecstack")
+                    .addFlags("-llog")
+                    .addFlags("-landroid")
+                    .addFlags("-lm")
+                    .addFlags("-o", mOutFile.getAbsolutePath());
+        } else {
+            mOutFile = new File(source.getParent(), nameNoExt);
+            args.addFlags("-o", mOutFile.getAbsolutePath());
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            args.addFlags("-pie");
+        }
+
+        return args.build();
+    }
 }

app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GCCCompiler.java

@@ -37,6 +37,15 @@ public CommandResult(CommandResult commandResult) {
         this(commandResult.getResultCode(), commandResult.getMessage());
     }
 
+    @Override
+    public String toString() {
+        return "CommandResult{" +
+                "message='" + message + '\'' +
+                ", resultCode=" + resultCode +
+                ", time=" + time +
+                '}';
+    }
+
     public long getTime() {
         return time;
     }
@@ -45,15 +54,6 @@ public void setTime(long time) {
         this.time = time;
     }
 
-    @Override
-    public String toString() {
-        return "ShellResult{" +
-                "resultCode=" + resultCode +
-                ", message='" + message + '\'' +
-                ", time=" + time +
-                '}';
-    }
-
     public int getResultCode() {
         return resultCode;
     }