diff --git a/templates/cpp-template-default/proj.android-studio/.gitignore b/templates/cpp-template-default/proj.android/.gitignore similarity index 100% rename from templates/cpp-template-default/proj.android-studio/.gitignore rename to templates/cpp-template-default/proj.android/.gitignore diff --git a/templates/cpp-template-default/proj.android-studio/app/.gitignore b/templates/cpp-template-default/proj.android/app/.gitignore similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/.gitignore rename to templates/cpp-template-default/proj.android/app/.gitignore diff --git a/templates/cpp-template-default/proj.android-studio/app/AndroidManifest.xml b/templates/cpp-template-default/proj.android/app/AndroidManifest.xml similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/AndroidManifest.xml rename to templates/cpp-template-default/proj.android/app/AndroidManifest.xml diff --git a/templates/cpp-template-default/proj.android-studio/app/build.gradle b/templates/cpp-template-default/proj.android/app/build.gradle similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/build.gradle rename to templates/cpp-template-default/proj.android/app/build.gradle diff --git a/templates/cpp-template-default/proj.android-studio/app/jni/Android.mk b/templates/cpp-template-default/proj.android/app/jni/Android.mk similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/jni/Android.mk rename to templates/cpp-template-default/proj.android/app/jni/Android.mk diff --git a/templates/cpp-template-default/proj.android-studio/app/jni/Application.mk b/templates/cpp-template-default/proj.android/app/jni/Application.mk similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/jni/Application.mk rename to templates/cpp-template-default/proj.android/app/jni/Application.mk diff --git a/templates/cpp-template-default/proj.android-studio/app/jni/hellocpp/main.cpp b/templates/cpp-template-default/proj.android/app/jni/hellocpp/main.cpp similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/jni/hellocpp/main.cpp rename to templates/cpp-template-default/proj.android/app/jni/hellocpp/main.cpp diff --git a/templates/cpp-template-default/proj.android-studio/app/proguard-rules.pro b/templates/cpp-template-default/proj.android/app/proguard-rules.pro similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/proguard-rules.pro rename to templates/cpp-template-default/proj.android/app/proguard-rules.pro diff --git a/templates/cpp-template-default/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/templates/cpp-template-default/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to templates/cpp-template-default/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/templates/cpp-template-default/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/templates/cpp-template-default/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to templates/cpp-template-default/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/templates/cpp-template-default/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/templates/cpp-template-default/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to templates/cpp-template-default/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/templates/cpp-template-default/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/templates/cpp-template-default/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to templates/cpp-template-default/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/templates/cpp-template-default/proj.android-studio/app/res/values/strings.xml b/templates/cpp-template-default/proj.android/app/res/values/strings.xml similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/res/values/strings.xml rename to templates/cpp-template-default/proj.android/app/res/values/strings.xml diff --git a/templates/cpp-template-default/proj.android-studio/app/src/org/cocos2dx/cpp/AppActivity.java b/templates/cpp-template-default/proj.android/app/src/org/cocos2dx/cpp/AppActivity.java similarity index 100% rename from templates/cpp-template-default/proj.android-studio/app/src/org/cocos2dx/cpp/AppActivity.java rename to templates/cpp-template-default/proj.android/app/src/org/cocos2dx/cpp/AppActivity.java diff --git a/templates/cpp-template-default/proj.android-studio/build.gradle b/templates/cpp-template-default/proj.android/build.gradle similarity index 100% rename from templates/cpp-template-default/proj.android-studio/build.gradle rename to templates/cpp-template-default/proj.android/build.gradle diff --git a/templates/cpp-template-default/proj.android-studio/gradle.properties b/templates/cpp-template-default/proj.android/gradle.properties similarity index 100% rename from templates/cpp-template-default/proj.android-studio/gradle.properties rename to templates/cpp-template-default/proj.android/gradle.properties diff --git a/templates/cpp-template-default/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/templates/cpp-template-default/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from templates/cpp-template-default/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to templates/cpp-template-default/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/templates/cpp-template-default/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/templates/cpp-template-default/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from templates/cpp-template-default/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to templates/cpp-template-default/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/templates/cpp-template-default/proj.android-studio/gradlew b/templates/cpp-template-default/proj.android/gradlew similarity index 100% rename from templates/cpp-template-default/proj.android-studio/gradlew rename to templates/cpp-template-default/proj.android/gradlew diff --git a/templates/cpp-template-default/proj.android-studio/gradlew.bat b/templates/cpp-template-default/proj.android/gradlew.bat similarity index 100% rename from templates/cpp-template-default/proj.android-studio/gradlew.bat rename to templates/cpp-template-default/proj.android/gradlew.bat diff --git a/templates/cpp-template-default/proj.android-studio/settings.gradle b/templates/cpp-template-default/proj.android/settings.gradle similarity index 100% rename from templates/cpp-template-default/proj.android-studio/settings.gradle rename to templates/cpp-template-default/proj.android/settings.gradle diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/.gitignore b/templates/js-template-default/frameworks/runtime-src/proj.android/.gitignore similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/.gitignore rename to templates/js-template-default/frameworks/runtime-src/proj.android/.gitignore diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/.gitignore b/templates/js-template-default/frameworks/runtime-src/proj.android/app/.gitignore similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/.gitignore rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/.gitignore diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml b/templates/js-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/build.gradle b/templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/build.gradle rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/get_environment.sh b/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/get_environment.sh rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Android.mk b/templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Android.mk rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk b/templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/Application.mk similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/Application.mk diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp b/templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/hellojavascript/main.cpp similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/hellojavascript/main.cpp diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/proguard-rules.pro b/templates/js-template-default/frameworks/runtime-src/proj.android/app/proguard-rules.pro similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/proguard-rules.pro rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/proguard-rules.pro diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/values/strings.xml b/templates/js-template-default/frameworks/runtime-src/proj.android/app/res/values/strings.xml similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/res/values/strings.xml rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/res/values/strings.xml diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java b/templates/js-template-default/frameworks/runtime-src/proj.android/app/src/org/cocos2dx/javascript/AppActivity.java similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java rename to templates/js-template-default/frameworks/runtime-src/proj.android/app/src/org/cocos2dx/javascript/AppActivity.java diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/build.gradle b/templates/js-template-default/frameworks/runtime-src/proj.android/build.gradle similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/build.gradle rename to templates/js-template-default/frameworks/runtime-src/proj.android/build.gradle diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle.properties b/templates/js-template-default/frameworks/runtime-src/proj.android/gradle.properties similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle.properties rename to templates/js-template-default/frameworks/runtime-src/proj.android/gradle.properties diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/templates/js-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to templates/js-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/templates/js-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to templates/js-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradlew b/templates/js-template-default/frameworks/runtime-src/proj.android/gradlew similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradlew rename to templates/js-template-default/frameworks/runtime-src/proj.android/gradlew diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradlew.bat b/templates/js-template-default/frameworks/runtime-src/proj.android/gradlew.bat similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradlew.bat rename to templates/js-template-default/frameworks/runtime-src/proj.android/gradlew.bat diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/settings.gradle b/templates/js-template-default/frameworks/runtime-src/proj.android/settings.gradle similarity index 100% rename from templates/js-template-default/frameworks/runtime-src/proj.android-studio/settings.gradle rename to templates/js-template-default/frameworks/runtime-src/proj.android/settings.gradle diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/.gitignore b/templates/lua-template-default/frameworks/runtime-src/proj.android/.gitignore similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/.gitignore rename to templates/lua-template-default/frameworks/runtime-src/proj.android/.gitignore diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/.gitignore b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/.gitignore similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/.gitignore rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/.gitignore diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/AndroidManifest.xml diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/build.gradle b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/build.gradle rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/get_environment.sh b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/get_environment.sh rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Android.mk b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Android.mk rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/Application.mk similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/Application.mk diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellolua/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/hellolua/main.cpp similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellolua/main.cpp rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/hellolua/main.cpp diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/proguard-rules.pro b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/proguard-rules.pro similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/proguard-rules.pro rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/proguard-rules.pro diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/values/strings.xml b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/values/strings.xml similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/res/values/strings.xml rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/values/strings.xml diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/lua/AppActivity.java b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/src/org/cocos2dx/lua/AppActivity.java similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/lua/AppActivity.java rename to templates/lua-template-default/frameworks/runtime-src/proj.android/app/src/org/cocos2dx/lua/AppActivity.java diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/build.gradle b/templates/lua-template-default/frameworks/runtime-src/proj.android/build.gradle similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/build.gradle rename to templates/lua-template-default/frameworks/runtime-src/proj.android/build.gradle diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradle.properties b/templates/lua-template-default/frameworks/runtime-src/proj.android/gradle.properties similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradle.properties rename to templates/lua-template-default/frameworks/runtime-src/proj.android/gradle.properties diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/templates/lua-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to templates/lua-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/templates/lua-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to templates/lua-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradlew b/templates/lua-template-default/frameworks/runtime-src/proj.android/gradlew similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradlew rename to templates/lua-template-default/frameworks/runtime-src/proj.android/gradlew diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradlew.bat b/templates/lua-template-default/frameworks/runtime-src/proj.android/gradlew.bat similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradlew.bat rename to templates/lua-template-default/frameworks/runtime-src/proj.android/gradlew.bat diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/settings.gradle b/templates/lua-template-default/frameworks/runtime-src/proj.android/settings.gradle similarity index 100% rename from templates/lua-template-default/frameworks/runtime-src/proj.android-studio/settings.gradle rename to templates/lua-template-default/frameworks/runtime-src/proj.android/settings.gradle diff --git a/tests/cpp-empty-test/proj.android-studio/.gitignore b/tests/cpp-empty-test/proj.android/.gitignore similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/.gitignore rename to tests/cpp-empty-test/proj.android/.gitignore diff --git a/tests/cpp-empty-test/proj.android-studio/app/.gitignore b/tests/cpp-empty-test/proj.android/app/.gitignore similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/.gitignore rename to tests/cpp-empty-test/proj.android/app/.gitignore diff --git a/tests/cpp-empty-test/proj.android-studio/app/AndroidManifest.xml b/tests/cpp-empty-test/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/AndroidManifest.xml rename to tests/cpp-empty-test/proj.android/app/AndroidManifest.xml diff --git a/tests/cpp-empty-test/proj.android-studio/app/build.gradle b/tests/cpp-empty-test/proj.android/app/build.gradle similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/build.gradle rename to tests/cpp-empty-test/proj.android/app/build.gradle diff --git a/tests/cpp-empty-test/proj.android-studio/app/jni/Android.mk b/tests/cpp-empty-test/proj.android/app/jni/Android.mk similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/jni/Android.mk rename to tests/cpp-empty-test/proj.android/app/jni/Android.mk diff --git a/tests/cpp-empty-test/proj.android-studio/app/jni/Application.mk b/tests/cpp-empty-test/proj.android/app/jni/Application.mk similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/jni/Application.mk rename to tests/cpp-empty-test/proj.android/app/jni/Application.mk diff --git a/tests/cpp-empty-test/proj.android-studio/app/jni/main.cpp b/tests/cpp-empty-test/proj.android/app/jni/main.cpp similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/jni/main.cpp rename to tests/cpp-empty-test/proj.android/app/jni/main.cpp diff --git a/tests/cpp-empty-test/proj.android-studio/app/proguard-rules.pro b/tests/cpp-empty-test/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/proguard-rules.pro rename to tests/cpp-empty-test/proj.android/app/proguard-rules.pro diff --git a/tests/cpp-empty-test/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/cpp-empty-test/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/cpp-empty-test/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/cpp-empty-test/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/cpp-empty-test/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/cpp-empty-test/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/cpp-empty-test/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/cpp-empty-test/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/cpp-empty-test/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/cpp-empty-test/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/cpp-empty-test/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/cpp-empty-test/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/cpp-empty-test/proj.android-studio/app/res/values/strings.xml b/tests/cpp-empty-test/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/res/values/strings.xml rename to tests/cpp-empty-test/proj.android/app/res/values/strings.xml diff --git a/tests/cpp-empty-test/proj.android-studio/app/src/org/cocos2dx/cpp_empty_test/AppActivity.java b/tests/cpp-empty-test/proj.android/app/src/org/cocos2dx/cpp_empty_test/AppActivity.java similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/app/src/org/cocos2dx/cpp_empty_test/AppActivity.java rename to tests/cpp-empty-test/proj.android/app/src/org/cocos2dx/cpp_empty_test/AppActivity.java diff --git a/tests/cpp-empty-test/proj.android-studio/build.gradle b/tests/cpp-empty-test/proj.android/build.gradle similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/build.gradle rename to tests/cpp-empty-test/proj.android/build.gradle diff --git a/tests/cpp-empty-test/proj.android-studio/gradle.properties b/tests/cpp-empty-test/proj.android/gradle.properties similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/gradle.properties rename to tests/cpp-empty-test/proj.android/gradle.properties diff --git a/tests/cpp-empty-test/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/cpp-empty-test/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/cpp-empty-test/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/cpp-empty-test/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/cpp-empty-test/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/cpp-empty-test/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/cpp-empty-test/proj.android-studio/gradlew b/tests/cpp-empty-test/proj.android/gradlew similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/gradlew rename to tests/cpp-empty-test/proj.android/gradlew diff --git a/tests/cpp-empty-test/proj.android-studio/gradlew.bat b/tests/cpp-empty-test/proj.android/gradlew.bat similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/gradlew.bat rename to tests/cpp-empty-test/proj.android/gradlew.bat diff --git a/tests/cpp-empty-test/proj.android-studio/settings.gradle b/tests/cpp-empty-test/proj.android/settings.gradle similarity index 100% rename from tests/cpp-empty-test/proj.android-studio/settings.gradle rename to tests/cpp-empty-test/proj.android/settings.gradle diff --git a/tests/cpp-tests/proj.android-studio/.gitignore b/tests/cpp-tests/proj.android/.gitignore similarity index 100% rename from tests/cpp-tests/proj.android-studio/.gitignore rename to tests/cpp-tests/proj.android/.gitignore diff --git a/tests/cpp-tests/proj.android-studio/app/.gitignore b/tests/cpp-tests/proj.android/app/.gitignore similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/.gitignore rename to tests/cpp-tests/proj.android/app/.gitignore diff --git a/tests/cpp-tests/proj.android-studio/app/AndroidManifest.xml b/tests/cpp-tests/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/AndroidManifest.xml rename to tests/cpp-tests/proj.android/app/AndroidManifest.xml diff --git a/tests/cpp-tests/proj.android-studio/app/build.gradle b/tests/cpp-tests/proj.android/app/build.gradle similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/build.gradle rename to tests/cpp-tests/proj.android/app/build.gradle diff --git a/tests/cpp-tests/proj.android-studio/app/jni/Android.mk b/tests/cpp-tests/proj.android/app/jni/Android.mk similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/jni/Android.mk rename to tests/cpp-tests/proj.android/app/jni/Android.mk diff --git a/tests/cpp-tests/proj.android-studio/app/jni/Application.mk b/tests/cpp-tests/proj.android/app/jni/Application.mk similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/jni/Application.mk rename to tests/cpp-tests/proj.android/app/jni/Application.mk diff --git a/tests/cpp-tests/proj.android-studio/app/jni/main.cpp b/tests/cpp-tests/proj.android/app/jni/main.cpp similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/jni/main.cpp rename to tests/cpp-tests/proj.android/app/jni/main.cpp diff --git a/tests/cpp-tests/proj.android-studio/app/proguard-rules.pro b/tests/cpp-tests/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/proguard-rules.pro rename to tests/cpp-tests/proj.android/app/proguard-rules.pro diff --git a/tests/cpp-tests/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/cpp-tests/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/cpp-tests/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/cpp-tests/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/cpp-tests/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/cpp-tests/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/cpp-tests/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/cpp-tests/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/cpp-tests/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/cpp-tests/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/cpp-tests/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/cpp-tests/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/cpp-tests/proj.android-studio/app/res/values/strings.xml b/tests/cpp-tests/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/res/values/strings.xml rename to tests/cpp-tests/proj.android/app/res/values/strings.xml diff --git a/tests/cpp-tests/proj.android-studio/app/src/org/cocos2dx/cpp_tests/AppActivity.java b/tests/cpp-tests/proj.android/app/src/org/cocos2dx/cpp_tests/AppActivity.java similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/src/org/cocos2dx/cpp_tests/AppActivity.java rename to tests/cpp-tests/proj.android/app/src/org/cocos2dx/cpp_tests/AppActivity.java diff --git a/tests/cpp-tests/proj.android-studio/app/src/org/cocos2dx/cpp_tests/JNITest.java b/tests/cpp-tests/proj.android/app/src/org/cocos2dx/cpp_tests/JNITest.java similarity index 100% rename from tests/cpp-tests/proj.android-studio/app/src/org/cocos2dx/cpp_tests/JNITest.java rename to tests/cpp-tests/proj.android/app/src/org/cocos2dx/cpp_tests/JNITest.java diff --git a/tests/cpp-tests/proj.android-studio/build.gradle b/tests/cpp-tests/proj.android/build.gradle similarity index 100% rename from tests/cpp-tests/proj.android-studio/build.gradle rename to tests/cpp-tests/proj.android/build.gradle diff --git a/tests/cpp-tests/proj.android-studio/gradle.properties b/tests/cpp-tests/proj.android/gradle.properties similarity index 100% rename from tests/cpp-tests/proj.android-studio/gradle.properties rename to tests/cpp-tests/proj.android/gradle.properties diff --git a/tests/cpp-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/cpp-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/cpp-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/cpp-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/cpp-tests/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/cpp-tests/proj.android-studio/gradlew b/tests/cpp-tests/proj.android/gradlew similarity index 100% rename from tests/cpp-tests/proj.android-studio/gradlew rename to tests/cpp-tests/proj.android/gradlew diff --git a/tests/cpp-tests/proj.android-studio/gradlew.bat b/tests/cpp-tests/proj.android/gradlew.bat similarity index 100% rename from tests/cpp-tests/proj.android-studio/gradlew.bat rename to tests/cpp-tests/proj.android/gradlew.bat diff --git a/tests/cpp-tests/proj.android-studio/settings.gradle b/tests/cpp-tests/proj.android/settings.gradle similarity index 100% rename from tests/cpp-tests/proj.android-studio/settings.gradle rename to tests/cpp-tests/proj.android/settings.gradle diff --git a/tests/game-controller-test/proj.android-studio/.gitignore b/tests/game-controller-test/proj.android/.gitignore similarity index 100% rename from tests/game-controller-test/proj.android-studio/.gitignore rename to tests/game-controller-test/proj.android/.gitignore diff --git a/tests/game-controller-test/proj.android-studio/app/.gitignore b/tests/game-controller-test/proj.android/app/.gitignore similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/.gitignore rename to tests/game-controller-test/proj.android/app/.gitignore diff --git a/tests/game-controller-test/proj.android-studio/app/AndroidManifest.xml b/tests/game-controller-test/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/AndroidManifest.xml rename to tests/game-controller-test/proj.android/app/AndroidManifest.xml diff --git a/tests/game-controller-test/proj.android-studio/app/build.gradle b/tests/game-controller-test/proj.android/app/build.gradle similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/build.gradle rename to tests/game-controller-test/proj.android/app/build.gradle diff --git a/tests/game-controller-test/proj.android-studio/app/jni/Android.mk b/tests/game-controller-test/proj.android/app/jni/Android.mk similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/jni/Android.mk rename to tests/game-controller-test/proj.android/app/jni/Android.mk diff --git a/tests/game-controller-test/proj.android-studio/app/jni/Application.mk b/tests/game-controller-test/proj.android/app/jni/Application.mk similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/jni/Application.mk rename to tests/game-controller-test/proj.android/app/jni/Application.mk diff --git a/tests/game-controller-test/proj.android-studio/app/jni/main.cpp b/tests/game-controller-test/proj.android/app/jni/main.cpp similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/jni/main.cpp rename to tests/game-controller-test/proj.android/app/jni/main.cpp diff --git a/tests/game-controller-test/proj.android-studio/app/proguard-rules.pro b/tests/game-controller-test/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/proguard-rules.pro rename to tests/game-controller-test/proj.android/app/proguard-rules.pro diff --git a/tests/game-controller-test/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/game-controller-test/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/game-controller-test/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/game-controller-test/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/game-controller-test/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/game-controller-test/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/game-controller-test/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/game-controller-test/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/game-controller-test/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/game-controller-test/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/game-controller-test/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/game-controller-test/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/game-controller-test/proj.android-studio/app/res/values/strings.xml b/tests/game-controller-test/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/res/values/strings.xml rename to tests/game-controller-test/proj.android/app/res/values/strings.xml diff --git a/tests/game-controller-test/proj.android-studio/app/src/org/cocos2dx/game_controller_test/AppActivity.java b/tests/game-controller-test/proj.android/app/src/org/cocos2dx/game_controller_test/AppActivity.java similarity index 100% rename from tests/game-controller-test/proj.android-studio/app/src/org/cocos2dx/game_controller_test/AppActivity.java rename to tests/game-controller-test/proj.android/app/src/org/cocos2dx/game_controller_test/AppActivity.java diff --git a/tests/game-controller-test/proj.android-studio/build.gradle b/tests/game-controller-test/proj.android/build.gradle similarity index 100% rename from tests/game-controller-test/proj.android-studio/build.gradle rename to tests/game-controller-test/proj.android/build.gradle diff --git a/tests/game-controller-test/proj.android-studio/gradle.properties b/tests/game-controller-test/proj.android/gradle.properties similarity index 100% rename from tests/game-controller-test/proj.android-studio/gradle.properties rename to tests/game-controller-test/proj.android/gradle.properties diff --git a/tests/game-controller-test/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/game-controller-test/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/game-controller-test/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/game-controller-test/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/game-controller-test/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/game-controller-test/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/game-controller-test/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/game-controller-test/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/game-controller-test/proj.android-studio/gradlew b/tests/game-controller-test/proj.android/gradlew similarity index 100% rename from tests/game-controller-test/proj.android-studio/gradlew rename to tests/game-controller-test/proj.android/gradlew diff --git a/tests/game-controller-test/proj.android-studio/gradlew.bat b/tests/game-controller-test/proj.android/gradlew.bat similarity index 100% rename from tests/game-controller-test/proj.android-studio/gradlew.bat rename to tests/game-controller-test/proj.android/gradlew.bat diff --git a/tests/game-controller-test/proj.android-studio/settings.gradle b/tests/game-controller-test/proj.android/settings.gradle similarity index 100% rename from tests/game-controller-test/proj.android-studio/settings.gradle rename to tests/game-controller-test/proj.android/settings.gradle diff --git a/tests/js-memory-gc-tests/.cocos-project.json b/tests/js-memory-gc-tests/.cocos-project.json deleted file mode 100644 index b62bcef23e..0000000000 --- a/tests/js-memory-gc-tests/.cocos-project.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "project_type": "js", - "has_native": true, - "win32_cfg": { - "project_path": "../../build", - "sln_file": "cocos2d-win32.sln", - "project_name": "js-tests", - "build_cfg_path": "project/proj.win32", - "exe_out_dir": "js-tests" - }, - "ios_cfg": { - "project_path": "../../build", - "project_file": "cocos2d_tests.xcodeproj", - "target_name": "js-tests iOS" - }, - "mac_cfg": { - "project_path": "../../build", - "project_file": "cocos2d_tests.xcodeproj", - "target_name": "js-tests Mac" - }, - "android_cfg": { - "project_path": "project/proj.android", - "studio_proj_path" : "project/proj.android-studio" - }, - "web_cfg": { - "project_path": "", - "run_root_dir": "../../", - "sub_url": "/tests/js-tests/", - "copy_resources": [ - { - "from": "../cpp-tests/Resources/", - "to": "res/" - }, - { - "from": "resjs", - "to": "res/" - } - ] - }, - "linux_cfg": { - "project_path": "project/proj.linux", - "project_name": "js-tests", - "cmake_path": "../../", - "build_dir": "../../build/linux-build", - "build_result_dir": "js-tests" - }, - "wp8_1_cfg" : { - "project_path": "../../build", - "sln_file": "cocos2d-win8.1-universal.sln", - "project_name": "js-tests.WindowsPhone" - }, - "metro_cfg" : { - "project_path": "../../build", - "sln_file": "cocos2d-win8.1-universal.sln", - "project_name": "js-tests.Windows" - }, - "engine_dir": "../../" -} diff --git a/tests/js-memory-gc-tests/main.js b/tests/js-memory-gc-tests/main.js deleted file mode 100644 index 392ac9f32e..0000000000 --- a/tests/js-memory-gc-tests/main.js +++ /dev/null @@ -1,130 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2012 cocos2d-x.org - Copyright (c) 2008-2010 Ricardo Quesada - Copyright (c) 2011 Zynga Inc. - - http://www.cocos2d-x.org - - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -/** - * A brief explanation for "project.json": - * Here is the content of project.json file, this is the global configuration for your game, you can modify it to customize some behavior. - * The detail of each field is under it. - { - "debugMode" : 1, - // "debugMode" possible values : - // 0 - No message will be printed. - // 1 - cc.error, cc.assert, cc.warn, cc.log will print in console. - // 2 - cc.error, cc.assert, cc.warn will print in console. - // 3 - cc.error, cc.assert will print in console. - // 4 - cc.error, cc.assert, cc.warn, cc.log will print on canvas, available only on web. - // 5 - cc.error, cc.assert, cc.warn will print on canvas, available only on web. - // 6 - cc.error, cc.assert will print on canvas, available only on web. - - "showFPS" : true, - // Left bottom corner fps information will show when "showFPS" equals true, otherwise it will be hide. - - "frameRate" : 60, - // "frameRate" set the wanted frame rate for your game, but the real fps depends on your game implementation and the running environment. - - "noCache" : false, - // "noCache" set whether your resources will be loaded with a timestamp suffix in the url. - // In this way, your resources will be force updated even if the browser holds a cache of it. - // It's very useful for mobile browser debugging. - - "id" : "gameCanvas", - // "gameCanvas" sets the id of your canvas element on the web page, it's useful only on web. - - "renderMode" : 0, - // "renderMode" sets the renderer type, only useful on web : - // 0 - Automatically chosen by engine - // 1 - Forced to use canvas renderer - // 2 - Forced to use WebGL renderer, but this will be ignored on mobile browsers - - "engineDir" : "../../frameworks/cocos2d-html5/", - // In debug mode, if you use the whole engine to develop your game, you should specify its relative path with "engineDir", - // but if you are using a single engine file, you can ignore it. - - "modules" : ["cocos2d", "extensions", "external"], - // "modules" defines which modules you will need in your game, it's useful only on web, - // using this can greatly reduce your game's resource size, and the cocos console tool can package your game with only the modules you set. - // For details about modules definitions, you can refer to "../../frameworks/cocos2d-html5/modulesConfig.json". - - "plugin": { - "facebook": { - "appId" : "1426774790893461", - "xfbml" : true, - "version" : "v2.0" - } - }, - // "plugin" is used by plugin-x for its settings, if you don't use it, you can ignore it. - - "jsList" : [ - ] - // "jsList" sets the list of js files in your game. - } - * - */ - -if(cc.sys){ - var scene3SearchPaths = cc.sys.localStorage.getItem("Scene3SearchPaths"); - if (scene3SearchPaths) - jsb.fileUtils.setSearchPaths(JSON.parse(scene3SearchPaths)); -} - -cc.game.onStart = function(){ - cc.view.enableRetina(false); - if (cc.sys.isNative) { - var resolutionPolicy = (cc.sys.os == cc.sys.OS_WP8 || cc.sys.os == cc.sys.OS_WINRT) ? cc.ResolutionPolicy.SHOW_ALL : cc.ResolutionPolicy.FIXED_HEIGHT; - cc.view.setDesignResolutionSize(800, 450, resolutionPolicy); - cc.view.resizeWithBrowserSize(true); - var searchPaths = jsb.fileUtils.getSearchPaths(); - searchPaths.push('script'); - searchPaths.push('src'); - var paths = [ - 'res' - ]; - for (var i = 0; i < paths.length; i++) { - searchPaths.push(paths[i]); - } - jsb.fileUtils.setSearchPaths(searchPaths); - } - else - { - cc.view.setDesignResolutionSize(800, 450, cc.ResolutionPolicy.SHOW_ALL); - cc.view.resizeWithBrowserSize(true); - // js-test use cpptest resource in debug mode , and in the release mode, console will copy the resource into the res dir - // so the respath will modify to res, - if (cc.game.config[cc.game.CONFIG_KEY.engineDir] !== "frameworks/cocos2d-html5") { - cc.loader.resPath = '../cpp-tests/Resources'; - } - else { - cc.loader.resPath = 'res'; - document.getElementById("cocosbanner").src = "res/Images/cocos2dbanner.png"; - } - } - - cc.LoaderScene.preload([], function () { - runMain(); - }, this); -}; -cc.game.run(); diff --git a/tests/js-memory-gc-tests/project.json b/tests/js-memory-gc-tests/project.json deleted file mode 100644 index 8f69cfbd29..0000000000 --- a/tests/js-memory-gc-tests/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "debugMode" : 1, - "showFPS" : true, - "frameRate" : 60, - "noCache" : false, - "id" : "gameCanvas", - "renderMode" : 0, - "engineDir" : "../../web/", - - "modules" : ["cocos2d", "extensions", "external"], - - "plugin": { - "facebook": { - "appId" : "1426774790893461", - "xfbml" : true, - "version" : "v2.0" - } - }, - - "jsList" : [ - "src/tests-main.js", - "src/tree-scene.js" - ] -} diff --git a/tests/js-memory-gc-tests/project/CMakeLists.txt b/tests/js-memory-gc-tests/project/CMakeLists.txt deleted file mode 100644 index 2cef356226..0000000000 --- a/tests/js-memory-gc-tests/project/CMakeLists.txt +++ /dev/null @@ -1,87 +0,0 @@ -#/**************************************************************************** -# Copyright (c) 2015-2017 Chukong Technologies Inc. -# -# http://www.cocos2d-x.org -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# ****************************************************************************/ - -set(APP_NAME js_memory_gc_tests) - -if(WIN32) - -else() - set(PLATFORM_SRC - proj.linux/main.cpp - ) -endif() - -set(SAMPLE_SRC - Classes/AppDelegate.cpp - Classes/js_DrawNode3D_bindings.cpp - Classes/js_Effect3D_bindings.cpp - ${PLATFORM_SRC} -) - -include_directories( - Classes - ../../../cocos/scripting/js-bindings/auto - ../../../cocos/scripting/js-bindings/manual - ../../../cocos/base - ../../../cocos/editor-support - ../../../cocos/audio/include - ../../../external/spidermonkey/include/${PLATFORM_FOLDER} - ../../../external/chipmunk/include/chipmunk -) - -# add the executable -add_executable(${APP_NAME} - ${SAMPLE_SRC} -) - -target_link_libraries(${APP_NAME} - jscocos2d - cocos2d -) - -set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}") - -set_target_properties(${APP_NAME} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${APP_BIN_DIR}") - - -if(LINUX) - set(RES_PREFIX "/Resources") -else() - set(RES_PREFIX "") -endif() - -pre_build(${APP_NAME} - COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}${RES_PREFIX}/script - COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}${RES_PREFIX}/res - COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}${RES_PREFIX}/src - COMMAND ${CMAKE_COMMAND} -E remove ${APP_BIN_DIR}${RES_PREFIX}/*.js - COMMAND ${CMAKE_COMMAND} -E remove ${APP_BIN_DIR}${RES_PREFIX}/*.json - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../../cpp-tests/Resources ${APP_BIN_DIR}${RES_PREFIX}/res - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}${RES_PREFIX}/res - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}${RES_PREFIX}/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../../../cocos/scripting/js-bindings/script ${APP_BIN_DIR}${RES_PREFIX}/script - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../main.js ${APP_BIN_DIR}${RES_PREFIX}/main.js - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../project.json ${APP_BIN_DIR}${RES_PREFIX}/project.json - ) diff --git a/tests/js-memory-gc-tests/project/Classes/AppDelegate.cpp b/tests/js-memory-gc-tests/project/Classes/AppDelegate.cpp deleted file mode 100644 index 401c32fc92..0000000000 --- a/tests/js-memory-gc-tests/project/Classes/AppDelegate.cpp +++ /dev/null @@ -1,183 +0,0 @@ -#include "AppDelegate.h" - -#include "cocos2d.h" -#include "audio/include/SimpleAudioEngine.h" -#include "scripting/js-bindings/manual/ScriptingCore.h" -#include "scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp" -#include "scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp" -#include "scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.hpp" -#include "scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp" -#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.hpp" -#include "scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.hpp" -#include "scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp" -#include "scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.h" -#include "scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.hpp" -#include "scripting/js-bindings/manual/navmesh/jsb_cocos2dx_navmesh_manual.h" -#include "scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.h" -#include "scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h" -#include "scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.h" -#include "scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.hpp" -#include "scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp" -#include "scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.h" -#include "scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h" -#include "scripting/js-bindings/manual/cocos2d_specifics.hpp" -#include "scripting/js-bindings/manual/cocosbuilder/cocosbuilder_specifics.hpp" -#include "scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_registration.h" -#include "scripting/js-bindings/manual/localstorage/js_bindings_system_registration.h" -#include "scripting/js-bindings/manual/jsb_opengl_registration.h" -#include "scripting/js-bindings/manual/network/XMLHTTPRequest.h" -#include "scripting/js-bindings/manual/network/jsb_websocket.h" -#include "scripting/js-bindings/manual/network/jsb_socketio.h" -#include "scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.h" - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h" -#elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h" -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp" -#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h" -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp" -#include "scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.h" -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp" -#endif - -USING_NS_CC; -USING_NS_CC_EXT; -using namespace CocosDenshion; - -AppDelegate::AppDelegate() -{ -} - -AppDelegate::~AppDelegate() -{ - ScriptEngineManager::destroyInstance(); -} - -void AppDelegate::initGLContextAttrs() -{ - GLContextAttrs glContextAttrs = {8, 8, 8, 8, 24, 8}; - - GLView::setGLContextAttrs(glContextAttrs); -} - -bool AppDelegate::applicationDidFinishLaunching() -{ - // initialize director - auto director = Director::getInstance(); - auto glview = director->getOpenGLView(); - if(!glview) { -#if(CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) - glview = cocos2d::GLViewImpl::create("js-tests"); -#else - glview = cocos2d::GLViewImpl::createWithRect("js-tests", Rect(0,0,900,640)); -#endif - director->setOpenGLView(glview); - } - - // set FPS. the default value is 1.0/60 if you don't call this - director->setAnimationInterval(1.0f / 60); - - ScriptingCore* sc = ScriptingCore::getInstance(); - sc->addRegisterCallback(register_all_cocos2dx); - sc->addRegisterCallback(register_cocos2dx_js_core); - sc->addRegisterCallback(jsb_register_system); - - sc->addRegisterCallback(register_all_cocos2dx_extension); - sc->addRegisterCallback(register_all_cocos2dx_extension_manual); - - sc->addRegisterCallback(jsb_register_chipmunk); - sc->addRegisterCallback(JSB_register_opengl); - - sc->addRegisterCallback(MinXmlHttpRequest::_js_register); - sc->addRegisterCallback(register_jsb_websocket); - sc->addRegisterCallback(register_jsb_socketio); - - sc->addRegisterCallback(register_all_cocos2dx_builder); - sc->addRegisterCallback(register_CCBuilderReader); - - sc->addRegisterCallback(register_all_cocos2dx_ui); - sc->addRegisterCallback(register_all_cocos2dx_ui_manual); - sc->addRegisterCallback(register_all_cocos2dx_studio); - sc->addRegisterCallback(register_all_cocos2dx_studio_manual); - - sc->addRegisterCallback(register_all_cocos2dx_spine); - sc->addRegisterCallback(register_all_cocos2dx_spine_manual); - - sc->addRegisterCallback(register_all_cocos2dx_3d); - sc->addRegisterCallback(register_all_cocos2dx_3d_manual); - - sc->addRegisterCallback(register_all_cocos2dx_3d_extension); - -#if CC_USE_3D_PHYSICS && CC_ENABLE_BULLET_INTEGRATION - sc->addRegisterCallback(register_all_cocos2dx_physics3d); - sc->addRegisterCallback(register_all_cocos2dx_physics3d_manual); -#endif - -#if CC_USE_NAVMESH - sc->addRegisterCallback(register_all_cocos2dx_navmesh); - sc->addRegisterCallback(register_all_cocos2dx_navmesh_manual); -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - sc->addRegisterCallback(JavascriptJavaBridge::_js_register); -#elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) - sc->addRegisterCallback(JavaScriptObjCBridge::_js_register); -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - sc->addRegisterCallback(register_all_cocos2dx_experimental_webView); - sc->addRegisterCallback(register_all_cocos2dx_experimental_webView_manual); -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - sc->addRegisterCallback(register_all_cocos2dx_experimental_video); - sc->addRegisterCallback(register_all_cocos2dx_experimental_video_manual); -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) - sc->addRegisterCallback(register_all_cocos2dx_audioengine); -#endif - - sc->start(); - sc->runScript("script/jsb_boot.js"); -#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0) - sc->enableDebugger(); -#endif - - auto pEngine = ScriptingCore::getInstance(); - ScriptEngineManager::getInstance()->setScriptEngine(pEngine); - - ScriptingCore::getInstance()->runScript("main.js"); - - return true; -} - -// This function will be called when the app is inactive. Note, when receiving a phone call it is invoked. -void AppDelegate::applicationDidEnterBackground() -{ - auto director = Director::getInstance(); - director->stopAnimation(); - director->getEventDispatcher()->dispatchCustomEvent("game_on_hide"); - SimpleAudioEngine::getInstance()->pauseBackgroundMusic(); - SimpleAudioEngine::getInstance()->pauseAllEffects(); -} - -// this function will be called when the app is active again -void AppDelegate::applicationWillEnterForeground() -{ - auto director = Director::getInstance(); - director->startAnimation(); - director->getEventDispatcher()->dispatchCustomEvent("game_on_show"); - SimpleAudioEngine::getInstance()->resumeBackgroundMusic(); - SimpleAudioEngine::getInstance()->resumeAllEffects(); -} diff --git a/tests/js-memory-gc-tests/project/Classes/AppDelegate.h b/tests/js-memory-gc-tests/project/Classes/AppDelegate.h deleted file mode 100644 index 1291b19026..0000000000 --- a/tests/js-memory-gc-tests/project/Classes/AppDelegate.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef _APP_DELEGATE_H_ -#define _APP_DELEGATE_H_ - -#include "platform/CCApplication.h" -/** - @brief The cocos2d Application. - - Private inheritance here hides part of interface from Director. - */ -class AppDelegate : private cocos2d::Application -{ -public: - AppDelegate(); - virtual ~AppDelegate(); - - void initGLContextAttrs() override; - - /** - @brief Implement Director and Scene init code here. - @return true Initialize success, app continue. - @return false Initialize failed, app terminate. - */ - virtual bool applicationDidFinishLaunching() override; - - /** - @brief Called when the application moves to the background - @param the pointer of the application - */ - virtual void applicationDidEnterBackground() override; - - /** - @brief Called when the application reenters the foreground - @param the pointer of the application - */ - virtual void applicationWillEnterForeground() override; -}; - -#endif // _APP_DELEGATE_H_ - diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/build.gradle b/tests/js-memory-gc-tests/project/proj.android-studio/app/build.gradle deleted file mode 100644 index 46b5e51d96..0000000000 --- a/tests/js-memory-gc-tests/project/proj.android-studio/app/build.gradle +++ /dev/null @@ -1,154 +0,0 @@ -import org.apache.tools.ant.taskdefs.condition.Os - -apply plugin: 'com.android.application' - -android { - compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() - buildToolsVersion '27.0.1' - - defaultConfig { - applicationId "org.cocos2dx.js_tests" - minSdkVersion PROP_MIN_SDK_VERSION - targetSdkVersion PROP_TARGET_SDK_VERSION - versionCode 1 - versionName "1.0" - - externalNativeBuild { - ndkBuild { - if (!project.hasProperty("PROP_NDK_MODE") || PROP_NDK_MODE.compareTo('none') != 0) { - // skip the NDK Build step if PROP_NDK_MODE is none - targets 'js_tests' - arguments 'NDK_TOOLCHAIN_VERSION=clang' - arguments 'APP_PLATFORM=android-' + PROP_APP_PLATFORM - arguments '-j' + Runtime.runtime.availableProcessors() - abiFilters.addAll(PROP_APP_ABI.split(':').collect { it as String }) - } - } - } - } - - sourceSets.main { - java.srcDir "src" - res.srcDir "res" - manifest.srcFile "AndroidManifest.xml" - } - - externalNativeBuild { - ndkBuild { - if (!project.hasProperty("PROP_NDK_MODE") || PROP_NDK_MODE.compareTo('none') != 0) { - // skip the NDK Build step if PROP_NDK_MODE is none - path "jni/Android.mk" - } - } - } - - signingConfigs { - - release { - if (project.hasProperty("RELEASE_STORE_FILE")) { - storeFile file(RELEASE_STORE_FILE) - storePassword RELEASE_STORE_PASSWORD - keyAlias RELEASE_KEY_ALIAS - keyPassword RELEASE_KEY_PASSWORD - } - } - } - - buildTypes { - release { - debuggable false - jniDebuggable false - renderscriptDebuggable false - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - if (project.hasProperty("RELEASE_STORE_FILE")) { - signingConfig signingConfigs.release - } - - externalNativeBuild { - ndkBuild { - arguments 'NDK_DEBUG=0' - } - } - } - - debug { - debuggable true - jniDebuggable true - renderscriptDebuggable true - externalNativeBuild { - ndkBuild { - arguments 'NDK_DEBUG=1' - } - } - } - } -} - -// a method used to invoke the cocos jscompile command -def compileJS(srcDir, dstDir) { - def compileArgs = ['jscompile', '-s', srcDir, '-d', dstDir] - - println 'running command : ' + 'cocos ' + compileArgs.join(' ') - exec { - executable 'cocos' - args compileArgs - } - - // remove the js files in dstDir - delete fileTree(dstDir) { - include '**/*.js' - } -} - -android.applicationVariants.all { variant -> - // delete previous files first - delete "${buildDir}/intermediates/assets/${variant.dirName}" - - variant.mergeAssets.doLast { - copy { - from "${buildDir}/../../../../res" - into "${buildDir}/intermediates/assets/${variant.dirName}/res" - } - - copy { - from "${buildDir}/../../../../src" - into "${buildDir}/intermediates/assets/${variant.dirName}/src" - } - - copy { - from("${buildDir}/../../../../../cpp-tests/Resources") { - exclude "**/*.gz" - } - into "${buildDir}/intermediates/assets/${variant.dirName}/res" - } - - copy { - from "${buildDir}/../../../../../../cocos/scripting/js-bindings/script" - into "${buildDir}/intermediates/assets/${variant.dirName}/script" - } - - copy { - from "${buildDir}/../../../../main.js" - from "${buildDir}/../../../../project.json" - into "${buildDir}/intermediates/assets/${variant.dirName}" - } - - // compile the scripts if necessary - def compileScript = (variant.name.compareTo('release') == 0) - if (project.hasProperty('PROP_COMPILE_SCRIPT')) { - compileScript = (PROP_COMPILE_SCRIPT.compareTo('1') == 0) - } - - if (compileScript) { - compileJS("${buildDir}/intermediates/assets/${variant.dirName}", - "${buildDir}/intermediates/assets/${variant.dirName}") - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':libcocos2dx') -} diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk b/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk deleted file mode 100644 index fe9cd96364..0000000000 --- a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := js_tests_shared - -LOCAL_MODULE_FILENAME := libjs_tests - -LOCAL_ARM_MODE := arm - -LOCAL_SRC_FILES := main.cpp \ - ../../../Classes/AppDelegate.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../Classes - -LOCAL_STATIC_LIBRARIES := cocos2d_js_static - - -LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=1 - -include $(BUILD_SHARED_LIBRARY) - -$(call import-add-path, $(LOCAL_PATH)/../../../../../../cocos) -$(call import-module,scripting/js-bindings/proj.android) diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk b/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk deleted file mode 100644 index a49b14ad8e..0000000000 --- a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/Application.mk +++ /dev/null @@ -1,16 +0,0 @@ -APP_STL := gnustl_static - -# Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices -#APP_ABI := armeabi-v7a - -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char -APP_LDFLAGS := -latomic -APP_ABI := armeabi - -ifeq ($(NDK_DEBUG),1) - APP_CPPFLAGS += -DCOCOS2D_DEBUG=1 - APP_OPTIM := debug -else - APP_CPPFLAGS += -DNDEBUG - APP_OPTIM := release -endif diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/src/org/cocos2dx/js_tests/AppActivity.java b/tests/js-memory-gc-tests/project/proj.android-studio/app/src/org/cocos2dx/js_tests/AppActivity.java deleted file mode 100644 index c568b02786..0000000000 --- a/tests/js-memory-gc-tests/project/proj.android-studio/app/src/org/cocos2dx/js_tests/AppActivity.java +++ /dev/null @@ -1,91 +0,0 @@ -/**************************************************************************** -Copyright (c) 2015-2017 Chukong Technologies Inc. - -http://www.cocos2d-x.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -****************************************************************************/ -package org.cocos2dx.js_tests; - -import org.cocos2dx.js_tests.R; -import org.cocos2dx.lib.Cocos2dxActivity; -import org.cocos2dx.lib.Cocos2dxGLSurfaceView; -import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.os.Bundle; - -public class AppActivity extends Cocos2dxActivity { - - private static AppActivity app = null; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - // Workaround in https://stackoverflow.com/questions/16283079/re-launch-of-activity-on-home-button-but-only-the-first-time/16447508 - if (!isTaskRoot()) { - // Android launched another instance of the root activity into an existing task - // so just quietly finish and go away, dropping the user back into the activity - // at the top of the stack (ie: the last state of this task) - // Don't need to finish it again since it's finished in super.onCreate . - return; - } - // DO OTHER INITIALIZATION BELOW - - app = this; - } - - @Override - public Cocos2dxGLSurfaceView onCreateView() { - Cocos2dxGLSurfaceView glSurfaceView = new Cocos2dxGLSurfaceView(this); - // TestCpp should create stencil buffer - glSurfaceView.setEGLConfigChooser(5, 6, 5, 0, 16, 8); - - return glSurfaceView; - } - - public static void showAlertDialog(final String title, final String message) { - app.runOnUiThread(new Runnable() { - @Override - public void run() { - AlertDialog alertDialog = new AlertDialog.Builder(app).create(); - alertDialog.setTitle(title); - alertDialog.setMessage(message); - alertDialog.setCancelable(true); - alertDialog.setIcon(R.mipmap.ic_launcher); - alertDialog.setButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - app.runOnGLThread(new Runnable() { - @Override - public void run() { - - Cocos2dxJavascriptJavaBridge.evalString("cc.log(\"Javascript Java bridge!\")"); - } - }); - } - }); - alertDialog.show(); - } - }); - } - -} diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/js-memory-gc-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index c6381ff0f7..0000000000 --- a/tests/js-memory-gc-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Mar 14 17:38:19 CST 2017 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/tests/js-memory-gc-tests/project/proj.ios/AppController.h b/tests/js-memory-gc-tests/project/proj.ios/AppController.h deleted file mode 100644 index 097b3c9d37..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/AppController.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2013 cocos2d-x.org - Copyright (c) 2013-2017 Chukong Technologies Inc. - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -@class RootViewController; - -@interface AppController : NSObject -{ - UIWindow *window; - RootViewController *viewController; -} - -@end - diff --git a/tests/js-memory-gc-tests/project/proj.ios/AppController.mm b/tests/js-memory-gc-tests/project/proj.ios/AppController.mm deleted file mode 100644 index 82c064ba0b..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/AppController.mm +++ /dev/null @@ -1,144 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2013 cocos2d-x.org - Copyright (c) 2013-2017 Chukong Technologies Inc. - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import -#import "cocos2d.h" -#import "AppController.h" -#import "AppDelegate.h" -#import "RootViewController.h" -#import "platform/ios/CCEAGLView-ios.h" -//#import -@implementation AppController - -#pragma mark - -#pragma mark Application lifecycle - -// cocos2d application instance -static AppDelegate s_sharedApplication; - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ - - // Override point for customization after application launch. - - // Add the view controller's view to the window and display. - window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]]; - CCEAGLView *eaglView = [CCEAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 - depthFormat: GL_DEPTH24_STENCIL8_OES - preserveBackbuffer: NO - sharegroup: nil - multiSampling: NO - numberOfSamples: 0 ]; - - [eaglView setMultipleTouchEnabled:YES]; - - // Use RootViewController manage CCEAGLView - viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil]; - viewController.wantsFullScreenLayout = YES; - viewController.view = eaglView; - - // Set RootViewController to window - if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0) - { - // warning: addSubView doesn't work on iOS6 - [window addSubview: viewController.view]; - } - else - { - // use this method on ios6 - [window setRootViewController:viewController]; - } - - [window makeKeyAndVisible]; - - [[UIApplication sharedApplication] setStatusBarHidden: YES]; - - // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); - cocos2d::Director::getInstance()->setOpenGLView(glview); - - cocos2d::Application::getInstance()->run(); - return YES; -} -- (void)applicationWillResignActive:(UIApplication *)application { - /* - Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - */ - cocos2d::Director::getInstance()->pause(); -} -//- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation -//{ -// return [FBSession.activeSession handleOpenURL:url]; -//} -- (void)applicationDidBecomeActive:(UIApplication *)application { - /* - Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - */ -// [FBAppCall handleDidBecomeActive]; - cocos2d::Director::getInstance()->resume(); -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - /* - Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - If your application supports background execution, called instead of applicationWillTerminate: when the user quits. - */ - cocos2d::Application::getInstance()->applicationDidEnterBackground(); -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - /* - Called as part of transition from the background to the inactive state: here you can undo many of the changes made on entering the background. - */ - cocos2d::Application::getInstance()->applicationWillEnterForeground(); -} - -- (void)applicationWillTerminate:(UIApplication *)application { - /* - Called when the application is about to terminate. - See also applicationDidEnterBackground:. - */ -} - - -#pragma mark - -#pragma mark Memory management - -- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - /* - Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later. - */ - cocos2d::Director::getInstance()->purgeCachedData(); -} - - -- (void)dealloc { - [super dealloc]; -} - -@end - diff --git a/tests/js-memory-gc-tests/project/proj.ios/Default-568h@2x.png b/tests/js-memory-gc-tests/project/proj.ios/Default-568h@2x.png deleted file mode 100644 index 66c6d1cead..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Default-568h@2x.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Default.png b/tests/js-memory-gc-tests/project/proj.ios/Default.png deleted file mode 100644 index dcb80725de..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Default.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Default@2x.png b/tests/js-memory-gc-tests/project/proj.ios/Default@2x.png deleted file mode 100644 index 84689888a1..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Default@2x.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Icon-114.png b/tests/js-memory-gc-tests/project/proj.ios/Icon-114.png deleted file mode 100644 index c3807861ad..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Icon-114.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Icon-120.png b/tests/js-memory-gc-tests/project/proj.ios/Icon-120.png deleted file mode 100644 index a5b49ccbb1..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Icon-120.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Icon-144.png b/tests/js-memory-gc-tests/project/proj.ios/Icon-144.png deleted file mode 100644 index 1526615c02..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Icon-144.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Icon-152.png b/tests/js-memory-gc-tests/project/proj.ios/Icon-152.png deleted file mode 100644 index 8aa82506d0..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Icon-152.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Icon-57.png b/tests/js-memory-gc-tests/project/proj.ios/Icon-57.png deleted file mode 100644 index 4fcc6fddff..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Icon-57.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Icon-72.png b/tests/js-memory-gc-tests/project/proj.ios/Icon-72.png deleted file mode 100644 index 2c573c8df4..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Icon-72.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Icon-76.png b/tests/js-memory-gc-tests/project/proj.ios/Icon-76.png deleted file mode 100644 index 8a1fa1850c..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.ios/Icon-76.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.ios/Info.plist b/tests/js-memory-gc-tests/project/proj.ios/Info.plist deleted file mode 100644 index 2a4c9dabd3..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/Info.plist +++ /dev/null @@ -1,113 +0,0 @@ - - - - - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSExceptionDomains - - cocos2d-x.org - - NSIncludesSubdomains - - NSTemporaryExceptionAllowsInsecureHTTPLoads - - NSTemporaryExceptionMinimumTLSVersion - TLSv1.1 - - - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFiles - - Icon-72.png - Icon.png - Icon@2x.png - Icon-57.png - Icon-114.png - Icon-144.png - - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - Icon-72.png - Icon.png - Icon@2x.png - Icon-57.png - Icon-114.png - Icon-144.png - - UIPrerenderedIcon - - - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleURLTypes - - - CFBundleURLSchemes - - fb1426774790893461 - - - - CFBundleVersion - 1.0 - FacebookAppID - 1426774790893461 - FacebookDisplayName - myFc - LSRequiresIPhoneOS - - UIAppFonts - - res/fonts/A Damn Mess.ttf - res/fonts/Abberancy.ttf - res/fonts/Abduction.ttf - res/fonts/American Typewriter.ttf - res/fonts/Courier New.ttf - res/fonts/Marker Felt.ttf - res/fonts/Paint Boy.ttf - res/fonts/Schwarzwald Regular.ttf - res/fonts/Scissor Cuts.ttf - res/fonts/tahoma.ttf - res/fonts/Thonburi.ttf - res/fonts/ThonburiBold.ttf - - UIPrerenderedIcon - - UIRequiredDeviceCapabilities - - accelerometer - - opengles-1 - - - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeRight - UIInterfaceOrientationLandscapeLeft - - - diff --git a/tests/js-memory-gc-tests/project/proj.ios/NativeOcClass.h b/tests/js-memory-gc-tests/project/proj.ios/NativeOcClass.h deleted file mode 100644 index f8440885c3..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/NativeOcClass.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2013-2017 Chukong Technologies Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - - -#import - -@interface NativeOcClass : NSObject - -+(float) callNative:(NSNumber *)a andInt:(NSString *)str; -+(void) callNativeWithParam:(NSString *)str; -+(NSString *)callNativeWithReturnString; -+(BOOL)callNativeUIWithTitle:(NSString *) title andContent:(NSString *)content; -+(BOOL)callNativeUIWithTitle:(NSString *) title andContent:(NSString *)content addBool:(BOOL)logicSwitch; -+(int)callNativeWithAdd:(NSNumber *)num1 and:(NSNumber *)num2; -@end diff --git a/tests/js-memory-gc-tests/project/proj.ios/NativeOcClass.m b/tests/js-memory-gc-tests/project/proj.ios/NativeOcClass.m deleted file mode 100644 index 65ca7373a9..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/NativeOcClass.m +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2013-2017 Chukong Technologies Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#import "NativeOcClass.h" -#if TARGET_OS_IPHONE -#import -#elif TARGET_OS_MAC -#import -#endif -@implementation NativeOcClass -+(float) callNative:(NSNumber *)a andInt:(NSString *)str{ - float b = [a floatValue]+111.3333; - NSLog(@"callNative string is %@ and int value is %f",str,b); - return b; -} -+(void)callNativeWithParam:(NSString *)str{ - NSLog(@"callNativeWithParam: str is %@ ",str); -} -+(NSString *)callNativeWithReturnString{ - return @"yes is a return string form objective-c"; -} -+(BOOL)callNativeWithReturnBool{ - return true; -} -+(int)callNativeWithAdd:(NSNumber *)num1 and:(NSNumber *)num2{ - return [num1 intValue]+[num2 intValue]; -} -#if TARGET_OS_IPHONE -+(BOOL)callNativeUIWithTitle:(NSString *) title andContent:(NSString *)content{ - UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title message:content delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"OK", nil]; - [alertView show]; - return true; -} -+(BOOL)callNativeUIWithTitle:(NSString *) title andContent:(NSString *)content addBool:(BOOL)logicSwitch{ - if (logicSwitch) - { - UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title message:content delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"it's true", nil]; - [alertView show]; - } - else - { - UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title message:content delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"it's false", nil]; - [alertView show]; - } - return true; -} -#elif TARGET_OS_MAC - -+(BOOL)callNativeUIWithTitle:(NSString *) title andContent:(NSString *)content{ - NSAlert *alert = [[NSAlert alloc] init]; - [alert addButtonWithTitle:@"OK"]; - [alert addButtonWithTitle:@"Cancel"]; - [alert setMessageText:title]; - [alert setInformativeText:content]; - [alert setAlertStyle:NSWarningAlertStyle]; - [alert runModal]; - return true; -} - -+(BOOL)callNativeUIWithTitle:(NSString *) title andContent:(NSString *)content addBool:(BOOL)logicSwitch{ - NSAlert *alert = [[NSAlert alloc] init]; - if (logicSwitch) - { - [alert addButtonWithTitle:@"it's true"]; - [alert addButtonWithTitle:@"Cancel"]; - } - else - { - [alert addButtonWithTitle:@"it's false"]; - [alert addButtonWithTitle:@"Cancel"]; - } - - [alert setMessageText:title]; - [alert setInformativeText:content]; - [alert setAlertStyle:NSWarningAlertStyle]; - [alert runModal]; - return true; -} -#endif -@end diff --git a/tests/js-memory-gc-tests/project/proj.ios/Prefix.pch b/tests/js-memory-gc-tests/project/proj.ios/Prefix.pch deleted file mode 100644 index b056d8694a..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'testjs' target in the 'testjs' project -// - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/tests/js-memory-gc-tests/project/proj.ios/RootViewController.h b/tests/js-memory-gc-tests/project/proj.ios/RootViewController.h deleted file mode 100644 index 11dfc4bf88..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/RootViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010-2011 cocos2d-x.org - Copyright (c) 2010 Ricardo Quesada - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#import - - -@interface RootViewController : UIViewController { - -} -- (BOOL)prefersStatusBarHidden; -@end diff --git a/tests/js-memory-gc-tests/project/proj.ios/RootViewController.mm b/tests/js-memory-gc-tests/project/proj.ios/RootViewController.mm deleted file mode 100644 index 0e1952eafd..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/RootViewController.mm +++ /dev/null @@ -1,84 +0,0 @@ -// -// testjsAppController.h -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import "RootViewController.h" - - -@implementation RootViewController - -/* - // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) { - // Custom initialization - } - return self; -} -*/ - -/* -// Implement loadView to create a view hierarchy programmatically, without using a nib. -- (void)loadView { -} -*/ - -/* -// Implement viewDidLoad to do additional setup after loading the view, typically from a nib. -- (void)viewDidLoad { - [super viewDidLoad]; -} - -*/ -// Override to allow orientations other than the default portrait orientation. -// This method is deprecated on ios6 -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return UIInterfaceOrientationIsLandscape( interfaceOrientation ); -} - -// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead -- (NSUInteger) supportedInterfaceOrientations{ -#ifdef __IPHONE_6_0 - return UIInterfaceOrientationMaskAllButUpsideDown; -#endif -} - -- (BOOL) shouldAutorotate { - return YES; -} - -//fix not hide status on ios7 -- (BOOL)prefersStatusBarHidden -{ - return YES; -} - -// Controls the application's preferred home indicator auto-hiding when this view controller is shown. -- (BOOL)prefersHomeIndicatorAutoHidden { - return YES; -} - -- (void)didReceiveMemoryWarning { - // Releases the view if it doesn't have a superview. - [super didReceiveMemoryWarning]; - - // Release any cached data, images, etc that aren't in use. -} - -- (void)viewDidUnload { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; -} - - -- (void)dealloc { - [super dealloc]; -} - - -@end diff --git a/tests/js-memory-gc-tests/project/proj.ios/main.m b/tests/js-memory-gc-tests/project/proj.ios/main.m deleted file mode 100644 index e3dedca28b..0000000000 --- a/tests/js-memory-gc-tests/project/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// testjs -// -// Created by Rolando Abarca on 3/19/12. -// Copyright __MyCompanyName__ 2012. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/tests/js-memory-gc-tests/project/proj.linux/main.cpp b/tests/js-memory-gc-tests/project/proj.linux/main.cpp deleted file mode 100644 index e236a953b3..0000000000 --- a/tests/js-memory-gc-tests/project/proj.linux/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "../Classes/AppDelegate.h" - -USING_NS_CC; - -int main(int argc, char **argv) -{ - // create the application instance - AppDelegate app; - return Application::getInstance()->run(); -} diff --git a/tests/js-memory-gc-tests/project/proj.mac/Icon.icns b/tests/js-memory-gc-tests/project/proj.mac/Icon.icns deleted file mode 100644 index 3d09e8fb4f..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.mac/Icon.icns and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.mac/Test_Info.plist b/tests/js-memory-gc-tests/project/proj.mac/Test_Info.plist deleted file mode 100644 index 608a82cdac..0000000000 --- a/tests/js-memory-gc-tests/project/proj.mac/Test_Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - Icon - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSHumanReadableCopyright - Copyright © 2012. All rights reserved. - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tests/js-memory-gc-tests/project/proj.mac/Test_Prefix.pch b/tests/js-memory-gc-tests/project/proj.mac/Test_Prefix.pch deleted file mode 100644 index 46c36a7e99..0000000000 --- a/tests/js-memory-gc-tests/project/proj.mac/Test_Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/tests/js-memory-gc-tests/project/proj.mac/en.lproj/InfoPlist.strings b/tests/js-memory-gc-tests/project/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/tests/js-memory-gc-tests/project/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/tests/js-memory-gc-tests/project/proj.mac/en.lproj/MainMenu.xib b/tests/js-memory-gc-tests/project/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 3dacdedbd0..0000000000 --- a/tests/js-memory-gc-tests/project/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TestCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TestCpp - - YES - - - About TestCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TestCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TestCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TestCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - NSWindow - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - NSWindow - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/tests/js-memory-gc-tests/project/proj.mac/main.cpp b/tests/js-memory-gc-tests/project/proj.mac/main.cpp deleted file mode 100644 index 4b6a1e9021..0000000000 --- a/tests/js-memory-gc-tests/project/proj.mac/main.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - Copyright (c) 2010 cocos2d-x.org - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -#include "AppDelegate.h" -#include "cocos2d.h" - -USING_NS_CC; - -int main(int argc, char *argv[]) -{ - AppDelegate app; - return Application::getInstance()->run(); -} - diff --git a/tests/js-memory-gc-tests/project/proj.win32/build-cfg.json b/tests/js-memory-gc-tests/project/proj.win32/build-cfg.json deleted file mode 100644 index d1965344bc..0000000000 --- a/tests/js-memory-gc-tests/project/proj.win32/build-cfg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "copy_resources": [ - { - "from": "../../src", - "to": "src" - }, - { - "from": "../../../cpp-tests/Resources", - "to": "res" - }, - { - "from": "../../main.js", - "to": "" - }, - { - "from": "../../project.json", - "to": "" - }, - { - "from": "../../../../cocos/scripting/js-bindings/script", - "to": "script" - } - ] -} diff --git a/tests/js-memory-gc-tests/project/proj.win32/js-tests.rc b/tests/js-memory-gc-tests/project/proj.win32/js-tests.rc deleted file mode 100644 index 3d664e8370..0000000000 --- a/tests/js-memory-gc-tests/project/proj.win32/js-tests.rc +++ /dev/null @@ -1,86 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -#endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON "res\\js-tests.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", "\0" - VALUE "FileDescription", "js-tests Module\0" - VALUE "FileVersion", "1, 0, 0, 1\0" - VALUE "InternalName", "js-tests\0" - VALUE "LegalCopyright", "Copyright \0" - VALUE "OriginalFilename", "js-tests.exe\0" - VALUE "ProductName", "js-tests Module\0" - VALUE "ProductVersion", "1, 0, 0, 1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0409, 0x04B0 - END -END - -///////////////////////////////////////////////////////////////////////////// -#endif // !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) diff --git a/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj b/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj deleted file mode 100644 index 023c24c5da..0000000000 --- a/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D0F06A44-A245-4D13-A498-0120C203B539} - js-tests - - - - Application - Unicode - v120 - v120_xp - v140 - v140_xp - v141 - v141_xp - - - Application - Unicode - v120 - v120_xp - v140 - v140_xp - v141 - v141_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.21005.1 - $(SolutionDir)$(Configuration).win32\js-tests\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\js-tests\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - _DEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)js-tests.tlb - js-tests.h - - - js-tests_i.c - js-tests_p.c - - - Disabled - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - - mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) - true - Windows - MachineX86 - - - if not exist "$(OutDir)" mkdir "$(OutDir)" - -mkdir "$(OutDir)\script" -mkdir "$(OutDir)\src" -mkdir "$(OutDir)\res" -xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\script" /e /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y -xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y -copy "$(ProjectDir)..\..\main.js" "$(OutDir)" -copy "$(ProjectDir)..\..\project.json" "$(OutDir)" -xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y - - - Copy js and resource files. - - - - - NDEBUG;%(PreprocessorDefinitions) - false - Win32 - true - $(IntDir)js-tests.tlb - js-tests.h - - - js-tests_i.c - js-tests_p.c - - - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - MultiThreadedDLL - - - Level3 - - - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories) - - - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - - mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies) - $(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories) - Windows - MachineX86 - true - - - if not exist "$(OutDir)" mkdir "$(OutDir)" - -mkdir "$(OutDir)\script" -mkdir "$(OutDir)\src" -mkdir "$(OutDir)\res" -xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y -xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\js-bindings\script\*" "$(OutDir)\script" /e /Y -xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y -xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y -copy "$(ProjectDir)..\..\main.js" "$(OutDir)" -copy "$(ProjectDir)..\..\project.json" "$(OutDir)" -xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y - Copy js and resource files. - - - - - - - - - - - - - - - - - - - - - - - - {39379840-825a-45a0-b363-c09ffef864bd} - - - - - - diff --git a/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj.filters b/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj.filters deleted file mode 100644 index b66e775a2e..0000000000 --- a/tests/js-memory-gc-tests/project/proj.win32/js-tests.vcxproj.filters +++ /dev/null @@ -1,55 +0,0 @@ - - - - - Classes - - - win32 - - - Classes - - - Classes - - - - - Classes - - - win32 - - - win32 - - - Classes - - - Classes - - - - - {73cd069e-e032-4051-8d30-65b08ab4f954} - - - {abaf0468-14d3-43ce-8d1a-8a4a34dba59b} - - - {bbe7342c-1f30-4512-b00a-841aa2d4ca9f} - - - - - resource - - - - - resource - - - \ No newline at end of file diff --git a/tests/js-memory-gc-tests/project/proj.win32/main.cpp b/tests/js-memory-gc-tests/project/proj.win32/main.cpp deleted file mode 100644 index f5ce0656ed..0000000000 --- a/tests/js-memory-gc-tests/project/proj.win32/main.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "main.h" -#include "AppDelegate.h" - -USING_NS_CC; - -// uncomment below line, open debug console -// #define USE_WIN32_CONSOLE - -int APIENTRY _tWinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - -#ifdef USE_WIN32_CONSOLE - AllocConsole(); - freopen("CONIN$", "r", stdin); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); -#endif - - // create the application instance - AppDelegate app; - - int ret = Application::getInstance()->run(); - -#ifdef USE_WIN32_CONSOLE - FreeConsole(); -#endif - - return ret; -} diff --git a/tests/js-memory-gc-tests/project/proj.win32/main.h b/tests/js-memory-gc-tests/project/proj.win32/main.h deleted file mode 100644 index a17450f556..0000000000 --- a/tests/js-memory-gc-tests/project/proj.win32/main.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Windows Header Files: -#include - -// C RunTime Header Files -#include "platform/CCStdC.h" - -#endif // __WINMAIN_H__ diff --git a/tests/js-memory-gc-tests/project/proj.win32/res/js-tests.ico b/tests/js-memory-gc-tests/project/proj.win32/res/js-tests.ico deleted file mode 100644 index feaf932a74..0000000000 Binary files a/tests/js-memory-gc-tests/project/proj.win32/res/js-tests.ico and /dev/null differ diff --git a/tests/js-memory-gc-tests/project/proj.win32/resource.h b/tests/js-memory-gc-tests/project/proj.win32/resource.h deleted file mode 100644 index 3436133bc7..0000000000 --- a/tests/js-memory-gc-tests/project/proj.win32/resource.h +++ /dev/null @@ -1,20 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by js-tests.RC -// - -#define IDS_PROJNAME 100 -#define IDR_TESTJS 100 - -#define ID_FILE_NEW_WINDOW 32771 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 201 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 32775 -#endif -#endif diff --git a/tests/js-memory-gc-tests/res/.gitignore b/tests/js-memory-gc-tests/res/.gitignore deleted file mode 100755 index 1d65afe366..0000000000 --- a/tests/js-memory-gc-tests/res/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#Do now ignore Marmalade icf files -!*.icf diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_01.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_01.png deleted file mode 100755 index 93aa6e983a..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_01.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_02.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_02.png deleted file mode 100755 index bf03d3312c..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_02.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_03.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_03.png deleted file mode 100755 index e01c593b40..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_03.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_04.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_04.png deleted file mode 100755 index c9b0ae2529..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_04.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_05.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_05.png deleted file mode 100755 index e65e6b2feb..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_05.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_06.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_06.png deleted file mode 100755 index 4c3be2334f..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_06.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_07.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_07.png deleted file mode 100755 index 4c38de3a78..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_07.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_08.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_08.png deleted file mode 100755 index fad80b8e9a..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_08.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_09.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_09.png deleted file mode 100755 index b0fa9aded3..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_09.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_10.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_10.png deleted file mode 100755 index 0abb6eab93..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_10.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_11.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_11.png deleted file mode 100755 index 7285fd6c76..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_11.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_12.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_12.png deleted file mode 100755 index ce7d672004..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_12.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_13.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_13.png deleted file mode 100755 index 92cbbd4da1..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_13.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/res/Images/grossini_dance_14.png b/tests/js-memory-gc-tests/res/Images/grossini_dance_14.png deleted file mode 100755 index ee7d1bba0a..0000000000 Binary files a/tests/js-memory-gc-tests/res/Images/grossini_dance_14.png and /dev/null differ diff --git a/tests/js-memory-gc-tests/src/tests-main.js b/tests/js-memory-gc-tests/src/tests-main.js deleted file mode 100644 index 8418a99628..0000000000 --- a/tests/js-memory-gc-tests/src/tests-main.js +++ /dev/null @@ -1,329 +0,0 @@ -// Custom Sprite -var MySprite = cc.Sprite.extend({ - ctor: function (path) { - this._super(path); - }, - something: function (x, y) { - this.setPosition(x,y); - } -}); - -// -// Scene Test 1 -// -function runScene1(sender) { - var scene = new cc.Scene(); - - for (i = 0; i < 5; i++) { - var sprite = new MySprite("res/Images/grossini_dance_01.png"); - sprite.something(50 + 50*i,200); - scene.addChild(sprite); - } - - return scene; -} - -// -// Scene Test 2 -// -function runScene2(sender) { - - var scene = new cc.Scene(); - - for (i = 0; i < 5; i++) { - var sprite = new cc.Sprite("res/Images/grossini_dance_08.png"); - sprite.setPosition(50 + 50*i,200); - scene.addChild(sprite); - } - - return scene; -} - -// -// Scene Test 3 -// -function runScene3(sender) { - - var scene = new cc.Scene(); - - var fontDef = new cc.FontDefinition(); - fontDef.fontName = "Arial"; - fontDef.fontSize = 32; - this.label = new cc.LabelTTF("See console!", fontDef); - this.label.setPosition(300,300); - scene.addChild(this.label); - - var touchListener = null; - var mouseListener = null; - - // 'browser' can use touches or mouse. - // The benefit of using 'touches' in a browser, is that it works both with mouse events or touches events - if ('touches' in cc.sys.capabilities) { - touchListener = cc.eventManager.addListener({ - event: cc.EventListener.TOUCH_ALL_AT_ONCE, - onTouchesMoved: function (touches, event) { - var delta = touches[0].getDelta(); - cc.log("onTouchesMoved:" + delta); - return true; - } - }, - 10); - } else if ('mouse' in cc.sys.capabilities) { - mouseListener = cc.eventManager.addListener({ - event: cc.EventListener.MOUSE, - onMouseMove: function (event) { - if(event.getButton() == cc.EventMouse.BUTTON_LEFT) - cc.log("onMouseMove" + event.getDelta()); - }, - onMouseScroll: function (event) { - var delta = cc.sys.isNative ? event.getScrollY() * 6 : -event.getScrollY(); - cc.log("onMouseScroll:" + delta); - return true; - } - }, - 10); - } - - this.label.onExit = function () { - if (touchListener) { - cc.eventManager.removeListener(touchListener); - } - if (mouseListener) { - cc.eventManager.removeListener(mouseListener); - } - cc.LabelTTF.prototype.onExit.call(this); - }; - - return scene; -} - - -function runScene4(sender) { - - var scene = new cc.Scene(); - - var actionTo = cc.jumpTo(2, cc.p(300, 300), 50, 4); - var actionBy = cc.jumpBy(2, cc.p(300, 0), 50, 4); - var actionUp = cc.jumpBy(2, cc.p(0, 0), 80, 4); - var actionByBack = actionBy.reverse(); - - var delay = cc.delayTime(0.25); - - var sprite1 = new cc.Sprite("res/Images/grossini_dance_08.png"); - sprite1.setPosition(10,10); - var sprite2 = new cc.Sprite("res/Images/grossini_dance_01.png"); - sprite2.setPosition(200,10); - var sprite3 = new cc.Sprite("res/Images/grossini_dance_04.png"); - sprite3.setPosition(400,10); - - scene.addChild(sprite1); - scene.addChild(sprite2); - scene.addChild(sprite3); - - sprite1.runAction(actionTo); - sprite2.runAction(cc.sequence(actionBy, delay, actionByBack)); - - var action = cc.sequence(actionUp, delay.clone()).repeatForever(); - sprite3.runAction(action); - - return scene; -} - - -function runScene5(sender) { - var scene = new cc.Scene(); - - var TREE_TAG = 888; - var tree = createTree(5, cc.rect(0, 0, cc.winSize.width, cc.winSize.height)); - scene.addChild(tree, 0, TREE_TAG); - - var fontDef = new cc.FontDefinition(); - fontDef.fontName = "Arial"; - fontDef.fontSize = 20; - fontDef.boundingWidth = cc.winSize.width * 0.8; - var label = new cc.LabelTTF("Click 'Replace Tree' to create a new tree and the current tree should be garbage collected", fontDef); - label.setPosition(cc.winSize.width / 2, cc.winSize.height / 2); - scene.addChild(label, 10); - - // menu - var menu = new cc.Menu(); - var button = new cc.MenuItemFont("Replace Tree", function () { - var levels = 4 + Math.floor( Math.random() * 4 ); - var newTree = createTree(levels, cc.rect(0, 0, cc.winSize.width, cc.winSize.height)); - label.string = "Now click 'Run GC', you should see a list of finalize message, the number should match the number of old tree nodes"; - cc.log("Now click 'Run GC', you should see a list of finalize message, the number should match the number of old tree nodes"); - var oldTree = scene.getChildByTag(TREE_TAG); - oldTree.removeFromParent(true); - scene.addChild(newTree, 0, TREE_TAG); - }); - button.fontSize = 20; - button.fontName = "Arial"; - menu.addChild(button); - menu.setPosition(cc.winSize.width / 4, cc.winSize.height - 40); - scene.addChild(menu); - - return scene; -} - -function runScene6 () { - var scene = new cc.Scene(); - - var callback = function () { - cc.log('A callback which do nothing'); - }; - - var sprite = new cc.Sprite("res/Images/grossini_dance_01.png"); - sprite.x = cc.winSize.width/2; - sprite.y = cc.winSize.height/2; - sprite.action = cc.callFunc(callback, sprite); - - var SPRITE_TAG = 999; - scene.addChild(sprite, 0, SPRITE_TAG); - - var fontDef = new cc.FontDefinition(); - fontDef.fontName = "Arial"; - fontDef.fontSize = 20; - fontDef.boundingWidth = cc.winSize.width * 0.8; - var label = new cc.LabelTTF("Click screen to remove sprite and it should be garbage collected", fontDef); - label.setPosition(cc.winSize.width / 2, cc.winSize.height / 2 + 100); - scene.addChild(label); - - var touchListener = cc.eventManager.addListener({ - event: cc.EventListener.TOUCH_ALL_AT_ONCE, - onTouchesEnded: function (touches, event) { - cc.sys.garbageCollect(); - cc.sys.garbageCollect(); - cc.log('You should see immidiately two release messages in Console (Sprite and Action)'); - label.setString('You should see immidiately two release messages in Console (Sprite and Action)'); - var target = event.getCurrentTarget(); - target.removeChildByTag(SPRITE_TAG); - cc.sys.garbageCollect(); - cc.eventManager.removeListener(touchListener); - } - }, scene); - - return scene; -} - -function runScene7 () { - var scene = new cc.Scene(); - - var fontDef = new cc.FontDefinition(); - fontDef.fontName = "Arial"; - fontDef.fontSize = 20; - fontDef.boundingWidth = cc.winSize.width * 0.8; - var label = new cc.LabelTTF("Click screen to remove button and it should be garbage collected", fontDef); - label.setPosition(cc.winSize.width / 2, cc.winSize.height / 2 + 100); - scene.addChild(label); - - var menu = new cc.Menu(); - var button = new cc.MenuItemFont("Remove myself", function () { - cc.sys.garbageCollect(); - cc.sys.garbageCollect(); - label.string = "Now click 'Run GC', you should see finalize message of button"; - cc.log("Now click 'Run GC', you should see finalize message of button"); - menu.removeAllChildren(true); - }, menu); - menu.addChild(button); - menu.setPosition(cc.winSize.width / 2, cc.winSize.height / 2); - scene.addChild(menu); - - return scene; -} - -function runScene8 () { - var scene = new cc.Scene(); - - var fontDef = new cc.FontDefinition(); - fontDef.fontName = "Arial"; - fontDef.fontSize = 20; - fontDef.boundingWidth = cc.winSize.width * 0.8; - var label = new cc.LabelTTF("Click screen to remove button and it should be garbage collected", fontDef); - label.setPosition(cc.winSize.width / 2, cc.winSize.height / 2 + 100); - scene.addChild(label); - - var scrollView = new cc.ScrollView(); - var obj = { - scrollView: scrollView - }; - scrollView.setDelegate(obj); - - var menu = new cc.Menu(); - menu.scrollView = scrollView; - var button = new cc.MenuItemFont("Remove ScrollView (invisible)", function () { - cc.sys.garbageCollect(); - label.string = "Now you should see finalize message of ScrollView"; - cc.log("Now you should see finalize message of ScrollView"); - delete menu.scrollView; - cc.sys.garbageCollect(); - }, menu); - menu.addChild(button); - menu.setPosition(cc.winSize.width / 2, cc.winSize.height / 2); - scene.addChild(menu); - - return scene; -} - -var tests = [ - runScene1, - runScene2, - runScene3, - runScene4, - runScene5, - runScene6, - runScene7, - runScene8 -]; - -var replaceScene = (function () { - var curr = tests.length-1; - - return function () { - if (curr < tests.length-1) { - curr++; - } - else { - curr = 0; - } - - var scene = tests[curr](); - - // menu - var menu = new cc.Menu(); - var button = new cc.MenuItemFont("Next Scene", replaceScene); - button.fontSize = 20; - button.fontName = "Arial"; - menu.addChild(button); - button = new cc.MenuItemFont("Run GC", cc.sys.garbageCollect); - button.fontSize = 20; - button.fontName = "Arial"; - button.x = cc.winSize.width/4; - button.y = cc.winSize.height - 60; - menu.addChild(button); - menu.setPosition(cc.winSize.width/2, 20); - scene.addChild(menu); - - cc.director.replaceScene(scene); - - cc.sys.garbageCollect(); - }; -})(); - -// -// Main Entry point -// -function runMain() { - - var scene = new cc.Scene(); - - // menu - var button = new cc.MenuItemFont("Start Test", replaceScene); - button.fontSize = 20; - button.fontName = "Arial"; - var menu = new cc.Menu(); - menu.addChild(button); - menu.setPosition(300,300); - - scene.addChild(menu); - cc.director.runScene(scene); -} diff --git a/tests/js-memory-gc-tests/src/tree-scene.js b/tests/js-memory-gc-tests/src/tree-scene.js deleted file mode 100644 index c57f5f769b..0000000000 --- a/tests/js-memory-gc-tests/src/tree-scene.js +++ /dev/null @@ -1,45 +0,0 @@ -var createTree = (function () { - -var _ORIGIN_WIDTH = 85; -var _ORIGIN_HEIGHT = 121; - -var _createNode = function (x, y) { - var node = new cc.Sprite("res/Images/grossini_dance_01.png"); - node.x = x; - node.y = y; - return node; -}; - -var _createLevel = function (upLevel, width, height, scale) { - var level = []; - var unitW = width / (upLevel.length * 2); - var y = - height / 2; - for (var i = 0; i < upLevel.length; ++i) { - var parent = upLevel[i]; - var centerx = parent.width * scale / 2; - var x = centerx - unitW / 2; - var left = _createNode(x / scale, y / scale); - x = centerx + unitW / 2; - var right = _createNode(x / scale, y / scale); - level.push(left); - parent.addChild(left); - level.push(right); - parent.addChild(right); - } - return level; -}; - -return function (levels, zone) { - var height = zone.height / levels; - var scale = height * 0.9 / _ORIGIN_HEIGHT; - if (scale > 1) scale = 1; - var root = _createNode(zone.x + zone.width/2, zone.y + zone.height - height/2); - root.scale = scale; - var nodes = [root]; - for (var i = 1; i < levels; ++i) { - nodes = _createLevel(nodes, zone.width, height, scale); - } - return root; -}; - -})(); \ No newline at end of file diff --git a/tests/js-tests/project/proj.android-studio/app/AndroidManifest.xml b/tests/js-tests/project/proj.android-studio/app/AndroidManifest.xml deleted file mode 100644 index 05f9386b5d..0000000000 --- a/tests/js-tests/project/proj.android-studio/app/AndroidManifest.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/js-tests/project/proj.android-studio/app/res/values/strings.xml b/tests/js-tests/project/proj.android-studio/app/res/values/strings.xml deleted file mode 100644 index e0eefac763..0000000000 --- a/tests/js-tests/project/proj.android-studio/app/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - JSTests - diff --git a/tests/js-tests/project/proj.android-studio/settings.gradle b/tests/js-tests/project/proj.android-studio/settings.gradle deleted file mode 100644 index 05e6a4191f..0000000000 --- a/tests/js-tests/project/proj.android-studio/settings.gradle +++ /dev/null @@ -1,4 +0,0 @@ -include ':libcocos2dx' -project(':libcocos2dx').projectDir = new File(settingsDir, '../../../../cocos/platform/android/libcocos2dx') -include ':JSTests' -project(':JSTests').projectDir = new File(settingsDir, 'app') diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/.gitignore b/tests/js-tests/project/proj.android/.gitignore similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/.gitignore rename to tests/js-tests/project/proj.android/.gitignore diff --git a/tests/js-tests/project/proj.android-studio/app/.gitignore b/tests/js-tests/project/proj.android/app/.gitignore similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/.gitignore rename to tests/js-tests/project/proj.android/app/.gitignore diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/AndroidManifest.xml b/tests/js-tests/project/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/AndroidManifest.xml rename to tests/js-tests/project/proj.android/app/AndroidManifest.xml diff --git a/tests/js-tests/project/proj.android-studio/app/build.gradle b/tests/js-tests/project/proj.android/app/build.gradle similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/build.gradle rename to tests/js-tests/project/proj.android/app/build.gradle diff --git a/tests/js-tests/project/proj.android-studio/app/get_environment.sh b/tests/js-tests/project/proj.android/app/get_environment.sh similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/get_environment.sh rename to tests/js-tests/project/proj.android/app/get_environment.sh diff --git a/tests/js-tests/project/proj.android-studio/app/jni/Android.mk b/tests/js-tests/project/proj.android/app/jni/Android.mk similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/jni/Android.mk rename to tests/js-tests/project/proj.android/app/jni/Android.mk diff --git a/tests/js-tests/project/proj.android-studio/app/jni/Application.mk b/tests/js-tests/project/proj.android/app/jni/Application.mk similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/jni/Application.mk rename to tests/js-tests/project/proj.android/app/jni/Application.mk diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/main.cpp b/tests/js-tests/project/proj.android/app/jni/main.cpp similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/jni/main.cpp rename to tests/js-tests/project/proj.android/app/jni/main.cpp diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/proguard-rules.pro b/tests/js-tests/project/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/proguard-rules.pro rename to tests/js-tests/project/proj.android/app/proguard-rules.pro diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/js-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/js-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/js-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/js-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/js-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/js-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/js-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/js-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/res/values/strings.xml b/tests/js-tests/project/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/res/values/strings.xml rename to tests/js-tests/project/proj.android/app/res/values/strings.xml diff --git a/tests/js-tests/project/proj.android-studio/app/src/org/cocos2dx/js_tests/AppActivity.java b/tests/js-tests/project/proj.android/app/src/org/cocos2dx/js_tests/AppActivity.java similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/src/org/cocos2dx/js_tests/AppActivity.java rename to tests/js-tests/project/proj.android/app/src/org/cocos2dx/js_tests/AppActivity.java diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/build.gradle b/tests/js-tests/project/proj.android/build.gradle similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/build.gradle rename to tests/js-tests/project/proj.android/build.gradle diff --git a/tests/js-tests/project/proj.android-studio/gradle.properties b/tests/js-tests/project/proj.android/gradle.properties similarity index 100% rename from tests/js-tests/project/proj.android-studio/gradle.properties rename to tests/js-tests/project/proj.android/gradle.properties diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/js-tests/project/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/js-tests/project/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/js-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/js-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/js-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/js-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/gradlew b/tests/js-tests/project/proj.android/gradlew similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/gradlew rename to tests/js-tests/project/proj.android/gradlew diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/gradlew.bat b/tests/js-tests/project/proj.android/gradlew.bat similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/gradlew.bat rename to tests/js-tests/project/proj.android/gradlew.bat diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/settings.gradle b/tests/js-tests/project/proj.android/settings.gradle similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/settings.gradle rename to tests/js-tests/project/proj.android/settings.gradle diff --git a/tests/js-tests/project/proj.android-studio/.gitignore b/tests/lua-empty-test/project/proj.android/.gitignore similarity index 100% rename from tests/js-tests/project/proj.android-studio/.gitignore rename to tests/lua-empty-test/project/proj.android/.gitignore diff --git a/tests/lua-empty-test/project/proj.android-studio/app/.gitignore b/tests/lua-empty-test/project/proj.android/app/.gitignore similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/.gitignore rename to tests/lua-empty-test/project/proj.android/app/.gitignore diff --git a/tests/lua-empty-test/project/proj.android-studio/app/AndroidManifest.xml b/tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/AndroidManifest.xml rename to tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml diff --git a/tests/lua-empty-test/project/proj.android-studio/app/build.gradle b/tests/lua-empty-test/project/proj.android/app/build.gradle similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/build.gradle rename to tests/lua-empty-test/project/proj.android/app/build.gradle diff --git a/tests/lua-empty-test/project/proj.android-studio/app/get_environment.sh b/tests/lua-empty-test/project/proj.android/app/get_environment.sh similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/get_environment.sh rename to tests/lua-empty-test/project/proj.android/app/get_environment.sh diff --git a/tests/lua-empty-test/project/proj.android-studio/app/jni/Android.mk b/tests/lua-empty-test/project/proj.android/app/jni/Android.mk similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/jni/Android.mk rename to tests/lua-empty-test/project/proj.android/app/jni/Android.mk diff --git a/tests/lua-empty-test/project/proj.android-studio/app/jni/Application.mk b/tests/lua-empty-test/project/proj.android/app/jni/Application.mk similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/jni/Application.mk rename to tests/lua-empty-test/project/proj.android/app/jni/Application.mk diff --git a/tests/js-tests/project/proj.android-studio/app/jni/main.cpp b/tests/lua-empty-test/project/proj.android/app/jni/main.cpp similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/jni/main.cpp rename to tests/lua-empty-test/project/proj.android/app/jni/main.cpp diff --git a/tests/js-tests/project/proj.android-studio/app/proguard-rules.pro b/tests/lua-empty-test/project/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/proguard-rules.pro rename to tests/lua-empty-test/project/proj.android/app/proguard-rules.pro diff --git a/tests/js-tests/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/lua-empty-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/lua-empty-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/js-tests/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/lua-empty-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/lua-empty-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/js-tests/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/lua-empty-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/lua-empty-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/js-tests/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/lua-empty-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/js-tests/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/lua-empty-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/lua-empty-test/project/proj.android-studio/app/res/values/strings.xml b/tests/lua-empty-test/project/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/res/values/strings.xml rename to tests/lua-empty-test/project/proj.android/app/res/values/strings.xml diff --git a/tests/lua-empty-test/project/proj.android-studio/app/src/org/cocos2dx/lua_empty_test/AppActivity.java b/tests/lua-empty-test/project/proj.android/app/src/org/cocos2dx/lua_empty_test/AppActivity.java similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/src/org/cocos2dx/lua_empty_test/AppActivity.java rename to tests/lua-empty-test/project/proj.android/app/src/org/cocos2dx/lua_empty_test/AppActivity.java diff --git a/tests/js-tests/project/proj.android-studio/build.gradle b/tests/lua-empty-test/project/proj.android/build.gradle similarity index 100% rename from tests/js-tests/project/proj.android-studio/build.gradle rename to tests/lua-empty-test/project/proj.android/build.gradle diff --git a/tests/lua-empty-test/project/proj.android-studio/gradle.properties b/tests/lua-empty-test/project/proj.android/gradle.properties similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/gradle.properties rename to tests/lua-empty-test/project/proj.android/gradle.properties diff --git a/tests/js-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/js-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/lua-empty-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/js-tests/project/proj.android-studio/gradlew b/tests/lua-empty-test/project/proj.android/gradlew similarity index 100% rename from tests/js-tests/project/proj.android-studio/gradlew rename to tests/lua-empty-test/project/proj.android/gradlew diff --git a/tests/js-tests/project/proj.android-studio/gradlew.bat b/tests/lua-empty-test/project/proj.android/gradlew.bat similarity index 100% rename from tests/js-tests/project/proj.android-studio/gradlew.bat rename to tests/lua-empty-test/project/proj.android/gradlew.bat diff --git a/tests/lua-empty-test/project/proj.android-studio/settings.gradle b/tests/lua-empty-test/project/proj.android/settings.gradle similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/settings.gradle rename to tests/lua-empty-test/project/proj.android/settings.gradle diff --git a/tests/lua-empty-test/project/proj.android-studio/.gitignore b/tests/lua-game-controller-test/project/proj.android/.gitignore similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/.gitignore rename to tests/lua-game-controller-test/project/proj.android/.gitignore diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/.gitignore b/tests/lua-game-controller-test/project/proj.android/app/.gitignore similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/.gitignore rename to tests/lua-game-controller-test/project/proj.android/app/.gitignore diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/AndroidManifest.xml b/tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/AndroidManifest.xml rename to tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/build.gradle b/tests/lua-game-controller-test/project/proj.android/app/build.gradle similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/build.gradle rename to tests/lua-game-controller-test/project/proj.android/app/build.gradle diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Android.mk b/tests/lua-game-controller-test/project/proj.android/app/jni/Android.mk similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/jni/Android.mk rename to tests/lua-game-controller-test/project/proj.android/app/jni/Android.mk diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/Application.mk b/tests/lua-game-controller-test/project/proj.android/app/jni/Application.mk similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/jni/Application.mk rename to tests/lua-game-controller-test/project/proj.android/app/jni/Application.mk diff --git a/tests/lua-empty-test/project/proj.android-studio/app/jni/main.cpp b/tests/lua-game-controller-test/project/proj.android/app/jni/main.cpp similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/jni/main.cpp rename to tests/lua-game-controller-test/project/proj.android/app/jni/main.cpp diff --git a/tests/lua-empty-test/project/proj.android-studio/app/proguard-rules.pro b/tests/lua-game-controller-test/project/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/proguard-rules.pro rename to tests/lua-game-controller-test/project/proj.android/app/proguard-rules.pro diff --git a/tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/lua-game-controller-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/lua-game-controller-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/lua-game-controller-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/lua-game-controller-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/res/values/strings.xml b/tests/lua-game-controller-test/project/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/res/values/strings.xml rename to tests/lua-game-controller-test/project/proj.android/app/res/values/strings.xml diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/src/org/cocos2dx/LuaGameControllerTest/AppActivity.java b/tests/lua-game-controller-test/project/proj.android/app/src/org/cocos2dx/LuaGameControllerTest/AppActivity.java similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/src/org/cocos2dx/LuaGameControllerTest/AppActivity.java rename to tests/lua-game-controller-test/project/proj.android/app/src/org/cocos2dx/LuaGameControllerTest/AppActivity.java diff --git a/tests/lua-empty-test/project/proj.android-studio/build.gradle b/tests/lua-game-controller-test/project/proj.android/build.gradle similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/build.gradle rename to tests/lua-game-controller-test/project/proj.android/build.gradle diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/gradle.properties b/tests/lua-game-controller-test/project/proj.android/gradle.properties similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/gradle.properties rename to tests/lua-game-controller-test/project/proj.android/gradle.properties diff --git a/tests/lua-empty-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/lua-game-controller-test/project/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/lua-game-controller-test/project/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/lua-game-controller-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/lua-game-controller-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/lua-game-controller-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/lua-empty-test/project/proj.android-studio/gradlew b/tests/lua-game-controller-test/project/proj.android/gradlew similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/gradlew rename to tests/lua-game-controller-test/project/proj.android/gradlew diff --git a/tests/lua-empty-test/project/proj.android-studio/gradlew.bat b/tests/lua-game-controller-test/project/proj.android/gradlew.bat similarity index 100% rename from tests/lua-empty-test/project/proj.android-studio/gradlew.bat rename to tests/lua-game-controller-test/project/proj.android/gradlew.bat diff --git a/tests/lua-game-controller-test/project/proj.android-studio/settings.gradle b/tests/lua-game-controller-test/project/proj.android/settings.gradle similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/settings.gradle rename to tests/lua-game-controller-test/project/proj.android/settings.gradle diff --git a/tests/lua-tests/project/proj.android-studio/app/.gitignore b/tests/lua-tests/project/proj.android-studio/app/.gitignore deleted file mode 100644 index 1de99493d6..0000000000 --- a/tests/lua-tests/project/proj.android-studio/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -/jniLibs diff --git a/tests/lua-tests/project/proj.android-studio/.gitignore b/tests/lua-tests/project/proj.android/.gitignore similarity index 100% rename from tests/lua-tests/project/proj.android-studio/.gitignore rename to tests/lua-tests/project/proj.android/.gitignore diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/.gitignore b/tests/lua-tests/project/proj.android/app/.gitignore similarity index 100% rename from tests/js-memory-gc-tests/project/proj.android-studio/app/.gitignore rename to tests/lua-tests/project/proj.android/app/.gitignore diff --git a/tests/lua-tests/project/proj.android-studio/app/AndroidManifest.xml b/tests/lua-tests/project/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/AndroidManifest.xml rename to tests/lua-tests/project/proj.android/app/AndroidManifest.xml diff --git a/tests/lua-tests/project/proj.android-studio/app/build.gradle b/tests/lua-tests/project/proj.android/app/build.gradle similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/build.gradle rename to tests/lua-tests/project/proj.android/app/build.gradle diff --git a/tests/lua-tests/project/proj.android-studio/app/get_environment.sh b/tests/lua-tests/project/proj.android/app/get_environment.sh similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/get_environment.sh rename to tests/lua-tests/project/proj.android/app/get_environment.sh diff --git a/tests/lua-tests/project/proj.android-studio/app/jni/Android.mk b/tests/lua-tests/project/proj.android/app/jni/Android.mk similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/jni/Android.mk rename to tests/lua-tests/project/proj.android/app/jni/Android.mk diff --git a/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk b/tests/lua-tests/project/proj.android/app/jni/Application.mk similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/jni/Application.mk rename to tests/lua-tests/project/proj.android/app/jni/Application.mk diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/main.cpp b/tests/lua-tests/project/proj.android/app/jni/main.cpp similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/jni/main.cpp rename to tests/lua-tests/project/proj.android/app/jni/main.cpp diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/proguard-rules.pro b/tests/lua-tests/project/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/proguard-rules.pro rename to tests/lua-tests/project/proj.android/app/proguard-rules.pro diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/lua-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/lua-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/lua-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/lua-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/lua-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/lua-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/lua-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/lua-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/lua-tests/project/proj.android-studio/app/res/values/strings.xml b/tests/lua-tests/project/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/res/values/strings.xml rename to tests/lua-tests/project/proj.android/app/res/values/strings.xml diff --git a/tests/lua-tests/project/proj.android-studio/app/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java b/tests/lua-tests/project/proj.android/app/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java rename to tests/lua-tests/project/proj.android/app/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java diff --git a/tests/lua-tests/project/proj.android-studio/app/src/org/cocos2dx/lua_tests/AppActivity.java b/tests/lua-tests/project/proj.android/app/src/org/cocos2dx/lua_tests/AppActivity.java similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/src/org/cocos2dx/lua_tests/AppActivity.java rename to tests/lua-tests/project/proj.android/app/src/org/cocos2dx/lua_tests/AppActivity.java diff --git a/tests/lua-game-controller-test/project/proj.android-studio/build.gradle b/tests/lua-tests/project/proj.android/build.gradle similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/build.gradle rename to tests/lua-tests/project/proj.android/build.gradle diff --git a/tests/lua-tests/project/proj.android-studio/gradle.properties b/tests/lua-tests/project/proj.android/gradle.properties similarity index 100% rename from tests/lua-tests/project/proj.android-studio/gradle.properties rename to tests/lua-tests/project/proj.android/gradle.properties diff --git a/tests/lua-game-controller-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/lua-tests/project/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/lua-tests/project/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/lua-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/lua-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/lua-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/lua-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/lua-game-controller-test/project/proj.android-studio/gradlew b/tests/lua-tests/project/proj.android/gradlew similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/gradlew rename to tests/lua-tests/project/proj.android/gradlew diff --git a/tests/lua-game-controller-test/project/proj.android-studio/gradlew.bat b/tests/lua-tests/project/proj.android/gradlew.bat similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/gradlew.bat rename to tests/lua-tests/project/proj.android/gradlew.bat diff --git a/tests/lua-tests/project/proj.android-studio/settings.gradle b/tests/lua-tests/project/proj.android/settings.gradle similarity index 100% rename from tests/lua-tests/project/proj.android-studio/settings.gradle rename to tests/lua-tests/project/proj.android/settings.gradle diff --git a/tests/performance-tests/proj.android-studio/.gitignore b/tests/performance-tests/proj.android-studio/.gitignore deleted file mode 100644 index 9c4de5825b..0000000000 --- a/tests/performance-tests/proj.android-studio/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures diff --git a/tests/performance-tests/proj.android-studio/app/jni/hellocpp/main.cpp b/tests/performance-tests/proj.android-studio/app/jni/hellocpp/main.cpp deleted file mode 100644 index cbe110c6d2..0000000000 --- a/tests/performance-tests/proj.android-studio/app/jni/hellocpp/main.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include - -#include -#include - -#include "AppDelegate.h" - -#define LOG_TAG "main" -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) - -namespace { -std::unique_ptr appDelegate; -} - -void cocos_android_app_init(JNIEnv* env) { - LOGD("cocos_android_app_init"); - appDelegate.reset(new AppDelegate()); -} diff --git a/tests/performance-tests/proj.android-studio/app/proguard-rules.pro b/tests/performance-tests/proj.android-studio/app/proguard-rules.pro deleted file mode 100644 index ecbfe714e5..0000000000 --- a/tests/performance-tests/proj.android-studio/app/proguard-rules.pro +++ /dev/null @@ -1,37 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in E:\developSoftware\Android\SDK/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Proguard Cocos2d-x for release --keep public class org.cocos2dx.** { *; } --dontwarn org.cocos2dx.** --keep public class com.chukong.** { *; } --dontwarn com.chukong.** --keep public com.huawei.android.** { *; } --dontwarn com.huawei.android.** - -# Proguard Apache HTTP for release --keep class org.apache.http.** { *; } --dontwarn org.apache.http.** - -# Proguard Android Webivew for release. uncomment if you are using a webview in cocos2d-x -#-keep public class android.net.http.SslError -#-keep public class android.webkit.WebViewClient - -#-dontwarn android.webkit.WebView -#-dontwarn android.net.http.SslError -#-dontwarn android.webkit.WebViewClient \ No newline at end of file diff --git a/tests/performance-tests/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/performance-tests/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 45ee51d15f..0000000000 Binary files a/tests/performance-tests/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/tests/performance-tests/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/performance-tests/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 0dd2a60899..0000000000 Binary files a/tests/performance-tests/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/tests/performance-tests/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/performance-tests/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index a32f16f930..0000000000 Binary files a/tests/performance-tests/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/tests/performance-tests/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/performance-tests/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 332f268edc..0000000000 Binary files a/tests/performance-tests/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/tests/performance-tests/proj.android-studio/build.gradle b/tests/performance-tests/proj.android-studio/build.gradle deleted file mode 100644 index baeb4a4fdf..0000000000 --- a/tests/performance-tests/proj.android-studio/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - jcenter() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/tests/performance-tests/proj.android-studio/gradle.properties b/tests/performance-tests/proj.android-studio/gradle.properties deleted file mode 100644 index 51c64c83ac..0000000000 --- a/tests/performance-tests/proj.android-studio/gradle.properties +++ /dev/null @@ -1,42 +0,0 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true - -# Android SDK version that will be used as the compile project -PROP_COMPILE_SDK_VERSION=14 - -# Android SDK version that will be used as the earliest version of android this application can run on -PROP_MIN_SDK_VERSION=14 - -# Android SDK version that will be used as the latest version of android this application has been tested on -PROP_TARGET_SDK_VERSION=27 - -# Android SDK version that NDK will compile to -PROP_APP_PLATFORM=14 - -# List of CPU Archtexture to build that application with -# Available architextures (armeabi | armeabi-v7a | arm64-v8a | x86) -# To build for multiple architexture, use the `:` between them -# Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86 -PROP_APP_ABI=armeabi - -# uncomment it and fill in sign information for release mode -#RELEASE_STORE_FILE=file path of keystore -#RELEASE_STORE_PASSWORD=password of keystore -#RELEASE_KEY_ALIAS=alias of key -#RELEASE_KEY_PASSWORD=password of key \ No newline at end of file diff --git a/tests/performance-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/performance-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 8c0fb64a86..0000000000 Binary files a/tests/performance-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/tests/performance-tests/proj.android-studio/gradlew b/tests/performance-tests/proj.android-studio/gradlew deleted file mode 100755 index 91a7e269e1..0000000000 --- a/tests/performance-tests/proj.android-studio/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/tests/performance-tests/proj.android-studio/gradlew.bat b/tests/performance-tests/proj.android-studio/gradlew.bat deleted file mode 100644 index 8a0b282aa6..0000000000 --- a/tests/performance-tests/proj.android-studio/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/tests/lua-game-controller-test/project/proj.android-studio/.gitignore b/tests/performance-tests/proj.android/.gitignore similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/.gitignore rename to tests/performance-tests/proj.android/.gitignore diff --git a/tests/performance-tests/proj.android-studio/app/.gitignore b/tests/performance-tests/proj.android/app/.gitignore similarity index 100% rename from tests/performance-tests/proj.android-studio/app/.gitignore rename to tests/performance-tests/proj.android/app/.gitignore diff --git a/tests/performance-tests/proj.android-studio/app/AndroidManifest.xml b/tests/performance-tests/proj.android/app/AndroidManifest.xml similarity index 100% rename from tests/performance-tests/proj.android-studio/app/AndroidManifest.xml rename to tests/performance-tests/proj.android/app/AndroidManifest.xml diff --git a/tests/performance-tests/proj.android-studio/app/build.gradle b/tests/performance-tests/proj.android/app/build.gradle similarity index 100% rename from tests/performance-tests/proj.android-studio/app/build.gradle rename to tests/performance-tests/proj.android/app/build.gradle diff --git a/tests/performance-tests/proj.android-studio/app/jni/Android.mk b/tests/performance-tests/proj.android/app/jni/Android.mk similarity index 100% rename from tests/performance-tests/proj.android-studio/app/jni/Android.mk rename to tests/performance-tests/proj.android/app/jni/Android.mk diff --git a/tests/performance-tests/proj.android-studio/app/jni/Application.mk b/tests/performance-tests/proj.android/app/jni/Application.mk similarity index 100% rename from tests/performance-tests/proj.android-studio/app/jni/Application.mk rename to tests/performance-tests/proj.android/app/jni/Application.mk diff --git a/tests/lua-tests/project/proj.android-studio/app/jni/main.cpp b/tests/performance-tests/proj.android/app/jni/hellocpp/main.cpp similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/jni/main.cpp rename to tests/performance-tests/proj.android/app/jni/hellocpp/main.cpp diff --git a/tests/lua-tests/project/proj.android-studio/app/proguard-rules.pro b/tests/performance-tests/proj.android/app/proguard-rules.pro similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/proguard-rules.pro rename to tests/performance-tests/proj.android/app/proguard-rules.pro diff --git a/tests/lua-tests/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png b/tests/performance-tests/proj.android/app/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/res/mipmap-hdpi/ic_launcher.png rename to tests/performance-tests/proj.android/app/res/mipmap-hdpi/ic_launcher.png diff --git a/tests/lua-tests/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png b/tests/performance-tests/proj.android/app/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/res/mipmap-mdpi/ic_launcher.png rename to tests/performance-tests/proj.android/app/res/mipmap-mdpi/ic_launcher.png diff --git a/tests/lua-tests/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png b/tests/performance-tests/proj.android/app/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/res/mipmap-xhdpi/ic_launcher.png rename to tests/performance-tests/proj.android/app/res/mipmap-xhdpi/ic_launcher.png diff --git a/tests/lua-tests/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png b/tests/performance-tests/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from tests/lua-tests/project/proj.android-studio/app/res/mipmap-xxhdpi/ic_launcher.png rename to tests/performance-tests/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png diff --git a/tests/performance-tests/proj.android-studio/app/res/values/strings.xml b/tests/performance-tests/proj.android/app/res/values/strings.xml similarity index 100% rename from tests/performance-tests/proj.android-studio/app/res/values/strings.xml rename to tests/performance-tests/proj.android/app/res/values/strings.xml diff --git a/tests/performance-tests/proj.android-studio/app/src/org/cocos2dx/cpp/AppActivity.java b/tests/performance-tests/proj.android/app/src/org/cocos2dx/cpp/AppActivity.java similarity index 100% rename from tests/performance-tests/proj.android-studio/app/src/org/cocos2dx/cpp/AppActivity.java rename to tests/performance-tests/proj.android/app/src/org/cocos2dx/cpp/AppActivity.java diff --git a/tests/lua-tests/project/proj.android-studio/build.gradle b/tests/performance-tests/proj.android/build.gradle similarity index 100% rename from tests/lua-tests/project/proj.android-studio/build.gradle rename to tests/performance-tests/proj.android/build.gradle diff --git a/tests/lua-game-controller-test/project/proj.android-studio/gradle.properties b/tests/performance-tests/proj.android/gradle.properties similarity index 100% rename from tests/lua-game-controller-test/project/proj.android-studio/gradle.properties rename to tests/performance-tests/proj.android/gradle.properties diff --git a/tests/lua-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar b/tests/performance-tests/proj.android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tests/lua-tests/project/proj.android-studio/gradle/wrapper/gradle-wrapper.jar rename to tests/performance-tests/proj.android/gradle/wrapper/gradle-wrapper.jar diff --git a/tests/performance-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/tests/performance-tests/proj.android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tests/performance-tests/proj.android-studio/gradle/wrapper/gradle-wrapper.properties rename to tests/performance-tests/proj.android/gradle/wrapper/gradle-wrapper.properties diff --git a/tests/lua-tests/project/proj.android-studio/gradlew b/tests/performance-tests/proj.android/gradlew similarity index 100% rename from tests/lua-tests/project/proj.android-studio/gradlew rename to tests/performance-tests/proj.android/gradlew diff --git a/tests/lua-tests/project/proj.android-studio/gradlew.bat b/tests/performance-tests/proj.android/gradlew.bat similarity index 100% rename from tests/lua-tests/project/proj.android-studio/gradlew.bat rename to tests/performance-tests/proj.android/gradlew.bat diff --git a/tests/performance-tests/proj.android-studio/settings.gradle b/tests/performance-tests/proj.android/settings.gradle similarity index 100% rename from tests/performance-tests/proj.android-studio/settings.gradle rename to tests/performance-tests/proj.android/settings.gradle diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 742c0b43f3..0e50ef1972 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 742c0b43f3d0af490aad87076fe59f55db81d2c9 +Subproject commit 0e50ef19725d586c8688f9509d056137a50ed7b5 diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index af52e0bd71..832b29e408 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -51,12 +51,9 @@ function build_android() # Build all samples echo "Building Android samples ..." export COCOS_CONSOLE_ROOT=$COCOS2DX_ROOT/tools/cocos2d-console/bin - export ANT_ROOT=/usr/bin export ANDROID_SDK_ROOT=/usr/local/android-sdk export COCOS_X_ROOT=$COCOS2DX_ROOT - export PATH=$ANT_ROOT:$ANDROID_SDK_ROOT:$COCOS_CONSOLE_ROOT:$PATH - - # share the obj folder to speed up building + export PATH=$ANDROID_SDK_ROOT:$COCOS_CONSOLE_ROOT:$PATH # build cpp-empty-test # pushd $COCOS2DX_ROOT/tests/cpp-empty-test @@ -64,32 +61,19 @@ function build_android() # popd # build cpp-tests - # src_dir=$COCOS2DX_ROOT/tests/cpp-empty-test/proj.android-studio/app/build/intermediates/ndkBuild - # dst_dir=$COCOS2DX_ROOT/tests/cpp-tests/proj.android-studio/app/build/intermediates/ndkBuild - # mkdir -p $dst_dir - # cp -a $src_dir/* $dst_dir pushd $COCOS2DX_ROOT/tests/cpp-tests - cocos compile -p android --android-studio + cocos compile -p android popd # build lua-tests - # src_dir=$dst_dir - # dst_dir=$COCOS2DX_ROOT/tests/lua-tests/project/proj.android/obj/ - # mkdir $dst_dir - # cp -a $src_dir/* $dst_dir pushd $COCOS2DX_ROOT/tests/lua-tests - cocos compile -p android --android-studio + cocos compile -p android popd # build js-tests - # src_dir=$COCOS2DX_ROOT/tests/lua-tests/project/proj.android-studio/app/build/intermediates/ndkBuild - # dst_dir=$COCOS2DX_ROOT/tests/js-tests/project/proj.android-studio/app/build/intermediates/ndkBuild - # mkdir -p $dst_dir - # cp -a $src_dir/* $dst_dir - # should uncomon it when building time not exceed time limit # pushd $COCOS2DX_ROOT/tests/js-tests - # cocos compile -p android --android-studio + # cocos compile -p android # popd }