Improve project templates

CMakeLists.txt

@@ -61,9 +61,6 @@ if(AX_BUILD_TESTS)
         add_subdirectory(${dir} ${CMAKE_BINARY_DIR}/tests/${target_name})
         set_target_properties(${target_name} PROPERTIES FOLDER "Apps")
     endmacro()
-
-    # add cpp-template-default into project(axmol) for tmp test
-    add_test_target(HelloCpp ${_AX_ROOT}/templates/cpp-template-default )
 
 	# add cpp tests default
     add_test_target(cpp-tests ${_AX_ROOT}/tests/cpp-tests)
@@ -78,7 +75,6 @@ if(AX_BUILD_TESTS)
     endif()
 
     if(AX_ENABLE_EXT_LUA)
-        add_test_target(HelloLua ${_AX_ROOT}/templates/lua-template-default)
         add_test_target(lua-tests ${_AX_ROOT}/tests/lua-tests)
     endif(AX_ENABLE_EXT_LUA)
 

templates/cpp-template-default/proj.android/app/AndroidManifest.xml → templates/common/proj.android/app/AndroidManifest.xml

@@ -2,21 +2,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:installLocation="auto">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-
     <uses-feature android:glEsVersion="0x00020000" />
-    
+
     <application
         android:label="@string/app_name"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher">
-        
+
         <!-- Tell AxmolActivity the name of our .so -->
         <meta-data android:name="android.app.lib_name"
-                   android:value="HelloCpp" />
+                   android:value="Dummy" />
 
         <activity
-            android:name="org.axmol.cpp.AppActivity"
+            android:name="org.axmol.app.AppActivity"
             android:screenOrientation="landscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
@@ -32,4 +30,6 @@
         </activity>
     </application>
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
 </manifest>

templates/cpp-template-default/proj.android/app/build.gradle → templates/common/proj.android/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply from: project(':libaxmol').projectDir.toString() + "/axutils.gradle"
 
 android {
-    namespace "org.axmol.hellocpp"
+    namespace "org.axmol.dummy"
     compileSdk PROP_COMPILE_SDK_VERSION.toInteger()
 
     // Setup native build tools: ndk & cmake
@@ -15,7 +15,7 @@ android {
     def cmakeOptions = Eval.me(nbtInfo[3])
 
     defaultConfig {
-        applicationId "org.axmol.hellocpp"
+        applicationId "org.axmol.dummy"
         minSdkVersion PROP_MIN_SDK_VERSION
         targetSdkVersion PROP_TARGET_SDK_VERSION
         versionCode 1

templates/cpp-template-default/proj.android/app/jni/main.cpp → templates/common/proj.android/app/jni/main.cpp

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/common/proj.android/app/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Dummy</string>
+</resources>

templates/cpp-template-default/proj.android/app/src/org/axmol/cpp/AppActivity.java → templates/common/proj.android/app/src/org/axmol/app/AppActivity.java

@@ -1,6 +1,7 @@
 /****************************************************************************
 Copyright (c) 2015-2016 Chukong Technologies Inc.
 Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
 https://axmolengine.github.io/
 
@@ -22,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
-package org.axmol.cpp;
+package org.axmol.app;
 
 import android.os.Bundle;
 import org.axmol.lib.AxmolActivity;

templates/cpp-template-default/proj.android/settings.gradle → templates/common/proj.android/settings.gradle

@@ -1,6 +1,6 @@
 import java.nio.file.Paths
 include ':libaxmol'
 project(':libaxmol').projectDir = new File(Paths.get("${System.env.AX_ROOT}/core/platform/android/libaxmol").toUri())
-include ':HelloCpp'
-project(':HelloCpp').projectDir = new File(settingsDir, 'app')
-rootProject.name = "HelloCpp"
+include ':Dummy'
+project(':Dummy').projectDir = new File(settingsDir, 'app')
+rootProject.name = "Dummy"

templates/lua-template-default/proj.ios_mac/ios/AppController.h → templates/common/proj.ios_mac/ios/AppController.h

@@ -2,6 +2,7 @@
  Copyright (c) 2010-2013 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/cpp-template-default/proj.ios_mac/ios/AppController.mm → templates/common/proj.ios_mac/ios/AppController.mm

@@ -2,6 +2,7 @@
  Copyright (c) 2010-2013 cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 
@@ -25,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 
 #import "AppController.h"
-#import "cocos2d.h"
+#import "axmol.h"
 #import "AppDelegate.h"
 #import "RootViewController.h"
 
@@ -36,7 +37,7 @@ @implementation AppController
 #pragma mark -
 #pragma mark Application lifecycle
 
-// cocos2d application instance
+// axmol application instance
 static AppDelegate s_sharedApplication;
 
 - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions

templates/cpp-template-default/proj.ios_mac/ios/Prefix.pch → templates/common/proj.ios_mac/ios/Prefix.pch

@@ -8,5 +8,5 @@
 #endif
 
 #ifdef __cplusplus
-	#include "cocos2d.h"
-#endif
+	#include "axmol.h"
+#endif

templates/lua-template-default/proj.ios_mac/ios/RootViewController.h → templates/common/proj.ios_mac/ios/RootViewController.h

@@ -2,6 +2,7 @@
  Copyright (c) 2013      cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm → templates/common/proj.ios_mac/ios/RootViewController.mm

@@ -2,6 +2,7 @@
  Copyright (c) 2013      cocos2d-x.org
  Copyright (c) 2013-2016 Chukong Technologies Inc.
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 
@@ -25,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 
 #import "RootViewController.h"
-#import "cocos2d.h"
+#import "axmol.h"
 #import "platform/ios/EAGLView-ios.h"
 
 @implementation RootViewController

templates/lua-template-default/proj.ios_mac/mac/Prefix.pch → templates/common/proj.ios_mac/mac/Prefix.pch

@@ -7,5 +7,5 @@
 #endif
 
 #ifdef __cplusplus
-	#include "cocos2d.h"
+	#include "axmol.h"
 #endif

templates/cpp-template-default/proj.ios_mac/mac/main.cpp → templates/common/proj.ios_mac/mac/main.cpp

@@ -1,6 +1,7 @@
 /****************************************************************************
  Copyright (c) 2010 cocos2d-x.org
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 
@@ -24,7 +25,7 @@
  ****************************************************************************/
 
 #include "AppDelegate.h"
-#include "cocos2d.h"
+#include "axmol.h"
 
 USING_NS_AX;
 

templates/cpp-template-default/proj.linux/main.cpp → templates/common/proj.linux/main.cpp

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/lua-template-default/proj.wasm/main.cpp → templates/common/proj.wasm/main.cpp

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/cpp-template-default/proj.win32/main.cpp → templates/common/proj.win32/main.cpp

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/cpp-template-default/proj.win32/main.h → templates/common/proj.win32/main.h

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/lua-template-default/proj.winrt/App.cpp → templates/common/proj.winrt/App.cpp

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/cpp-template-default/proj.winrt/App.h → templates/common/proj.winrt/App.h

@@ -1,5 +1,6 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
+ Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
 
  https://axmolengine.github.io/
 

templates/lua-template-default/proj.winrt/App.xaml → templates/common/proj.winrt/App.xaml

@@ -6,7 +6,7 @@
 
     <Application.Resources>
 
-      <x:String x:Key="AppName">HelloCpp</x:String>
+      <x:String x:Key="AppName">Dummy</x:String>
 
     </Application.Resources>
 </Application>

templates/cpp-template-default/proj.winrt/Package.appxmanifest → templates/common/proj.winrt/Package.appxmanifest

@@ -3,7 +3,7 @@
   <Identity Name="fe5bbe02-0ca6-4dc3-ab15-94260df03d68" Publisher="CN=axmol-ci" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="fe5bbe02-0ca6-4dc3-ab15-94260df03d68" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-    <DisplayName>HelloCpp</DisplayName>
+    <DisplayName>Dummy</DisplayName>
     <PublisherDisplayName>Microsoft Open Technologies, Inc.</PublisherDisplayName>
     <Logo>Content\StoreLogo.png</Logo>
   </Properties>
@@ -16,12 +16,12 @@
   <Applications>
     <Application Id="App" 
       Executable="$targetnametoken$.exe" 
-      EntryPoint="HelloCpp.App">
+      EntryPoint="Dummy.App">
       <uap:VisualElements 
-        DisplayName="HelloCpp" 
+        DisplayName="Dummy" 
         Square150x150Logo="Content\Square150x150Logo.png" 
 	Square44x44Logo="Content\Square44x44Logo.png" 
-	Description="HelloCpp" 
+	Description="Dummy" 
 	BackgroundColor="#464646">
         <uap:DefaultTile Wide310x150Logo="Content\Wide310x150Logo.png">
           <uap:ShowNameOnTiles>