diff --git a/scripts/init.js b/scripts/init.js index 2c8b2bbd..d8099cb6 100644 --- a/scripts/init.js +++ b/scripts/init.js @@ -1,6 +1,111 @@ var fs = require('fs'); +var path = require('path') + require('shelljs/global') +const targetJSPath = `${__dirname}/../target/js` +const targetAndroidPath = `${__dirname}/../target/android` + +function copyFile(srcPath, tarPath, cb) { + var rs = fs.createReadStream(srcPath) + rs.on('error', function (err) { + if (err) { + console.log('read error', srcPath) + } + cb && cb(err) + }) + + var ws = fs.createWriteStream(tarPath) + ws.on('error', function (err) { + if (err) { + console.log('write error', tarPath) + } + cb && cb(err) + }) + ws.on('close', function (ex) { + cb && cb(ex) + }) + + rs.pipe(ws) +} + +function copyFolder(srcDir, tarDir, cb) { + fs.readdir(srcDir, function (err, files) { + var count = 0 + var checkEnd = function () { + ++count == files.length && cb && cb() + } + + if (err) { + checkEnd() + return + } + + files.forEach(function (file) { + var srcPath = path.join(srcDir, file) + var tarPath = path.join(tarDir, file) + + fs.stat(srcPath, function (err, stats) { + if (stats.isDirectory()) { + fs.mkdir(tarPath, function (err) { + if (err) { + console.log(err) + return + } + copyFolder(srcPath, tarPath, checkEnd) + }) + } else { + copyFile(srcPath, tarPath, checkEnd) + } + }) + }) + files.length === 0 && cb && cb() + }) +} + +function initJS(path, name) { + if (fs.existsSync(path)) { + console.warn(`Dir:${process.cwd()}/${path} already exists`) + return; + } + fs.mkdir(path, function (err) { + if (err) { + return console.error(err); + } + console.log(`create dir ${path} success`); + fs.writeFileSync(`${path}/package.json`, fs.readFileSync(`${targetJSPath}/_package.json`).toString().replace(/__\$__/g, name)) + fs.writeFileSync(`${path}/tsconfig.json`, fs.readFileSync(`${targetJSPath}/_tsconfig.json`)) + fs.writeFileSync(`${path}/rollup.config.js`, fs.readFileSync(`${targetJSPath}/_rollup.config.js`)) + fs.writeFileSync(`${path}/.gitignore`, fs.readFileSync(`${targetJSPath}/_gitignore`)) + fs.mkdirSync(`${path}/.vscode`) + fs.writeFileSync(`${path}/.vscode/launch.json`, fs.readFileSync(`${targetJSPath}/_launch.json`).toString().replace(/__\$__/g, name)) + fs.writeFileSync(`${path}/.vscode/tasks.json`, fs.readFileSync(`${targetJSPath}/_tasks.json`).toString().replace(/__\$__/g, name)) + fs.mkdirSync(`${path}/src`) + fs.writeFileSync(`${path}/src/${name}.ts`, fs.readFileSync(`${targetJSPath}/$.ts`).toString().replace(/__\$__/g, name)) + fs.writeFileSync(`${path}/index.ts`, `export default ['src/${name}']`) + exec(`cd ${path} && npm install && npm run build`, () => { + console.log(`Create Doric JS Project Success`) + }) + }) +} +function initAndroid(path, name) { + if (fs.existsSync(path)) { + console.warn(`Dir:${process.cwd()}/${path} already exists`) + return; + } + console.log(`create dir ${path} success`); + fs.mkdir(path, function (err) { + if (err) { + return console.error(err); + } + copyFolder(`${targetAndroidPath}`, `${path}`, () => { + const mainFiles = `app/src/main/java/pub/doric/example/MainActivity.java` + fs.writeFileSync(`${path}/${mainFiles}`, fs.readFileSync(`${targetAndroidPath}/${mainFiles}`).toString().replace(/__\$__/g, name)) + console.log(`Create Doric Android Project Success`) + }) + }) +} + module.exports = function (name) { if (fs.existsSync(name)) { console.warn(`Dir:${process.cwd()}/${name} already exists`) @@ -10,19 +115,7 @@ module.exports = function (name) { if (err) { return console.error(err); } - console.log(`create dir ${name} success`); - fs.writeFileSync(`${name}/package.json`, fs.readFileSync(`${__dirname}/../contents/_package.json`).toString().replace(/__\$__/g, name)) - fs.writeFileSync(`${name}/tsconfig.json`, fs.readFileSync(`${__dirname}/../contents/_tsconfig.json`)) - fs.writeFileSync(`${name}/rollup.config.js`, fs.readFileSync(`${__dirname}/../contents/_rollup.config.js`)) - fs.writeFileSync(`${name}/.gitignore`, fs.readFileSync(`${__dirname}/../contents/_gitignore`)) - fs.mkdirSync(`${name}/.vscode`) - fs.writeFileSync(`${name}/.vscode/launch.json`, fs.readFileSync(`${__dirname}/../contents/_launch.json`).toString().replace(/__\$__/g, name)) - fs.writeFileSync(`${name}/.vscode/tasks.json`, fs.readFileSync(`${__dirname}/../contents/_tasks.json`).toString().replace(/__\$__/g, name)) - fs.mkdirSync(`${name}/src`) - fs.writeFileSync(`${name}/src/${name}.ts`, fs.readFileSync(`${__dirname}/../contents/$.ts`).toString().replace(/__\$__/g, name)) - fs.writeFileSync(`${name}/index.ts`, `export default ['src/${name}']`) - exec(`cd ${name} && npm install && npm run build`, () => { - console.log(`Create Doric Project ${name} Success`) - }) + initJS(`${process.cwd()}/${name}/js`, name) + initAndroid(`${process.cwd()}/${name}/android`, name) }) } \ No newline at end of file diff --git a/target/android/.gitignore b/target/android/.gitignore new file mode 100644 index 00000000..603b1407 --- /dev/null +++ b/target/android/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/target/android/app/.gitignore b/target/android/app/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/target/android/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/target/android/app/build.gradle b/target/android/app/build.gradle new file mode 100644 index 00000000..7b514939 --- /dev/null +++ b/target/android/app/build.gradle @@ -0,0 +1,34 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + defaultConfig { + applicationId "pub.doric.example" + minSdkVersion 16 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + sourceSets { + main { + assets.srcDirs = [project.getRootDir().getParent() + "/js/bundle/src"] + } + } + + dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation "pub.doric:core:0.1.0" + debugImplementation "pub.doric:core:0.1.0" + } +} \ No newline at end of file diff --git a/target/android/app/proguard-rules.pro b/target/android/app/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/target/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# 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 *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/target/android/app/src/main/AndroidManifest.xml b/target/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..4ea1c05f --- /dev/null +++ b/target/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/android/app/src/main/java/pub/doric/example/MainActivity.java b/target/android/app/src/main/java/pub/doric/example/MainActivity.java new file mode 100644 index 00000000..06285095 --- /dev/null +++ b/target/android/app/src/main/java/pub/doric/example/MainActivity.java @@ -0,0 +1,21 @@ +package pub.doric.example; + + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +import pub.doric.DoricPanel; +import pub.doric.utils.DoricUtils; + +public class MainActivity extends AppCompatActivity { + private final String BUNDLE_NAME = "__$__"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + DoricPanel doricPanel = findViewById(R.id.doric_panel); + doricPanel.config(DoricUtils.readAssetFile(BUNDLE_NAME + ".js"), BUNDLE_NAME); + } +} diff --git a/target/android/app/src/main/java/pub/doric/example/MainApplication.java b/target/android/app/src/main/java/pub/doric/example/MainApplication.java new file mode 100644 index 00000000..bd6147a3 --- /dev/null +++ b/target/android/app/src/main/java/pub/doric/example/MainApplication.java @@ -0,0 +1,18 @@ +package pub.doric.example; + +import android.app.Application; + +import pub.doric.Doric; + +/** + * @Description: pub.doric.example + * @Author: pengfei.zhou + * @CreateDate: 2019-12-05 + */ +public class MainApplication extends Application { + @Override + public void onCreate() { + super.onCreate(); + Doric.init(this); + } +} diff --git a/target/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/target/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..1f6bb290 --- /dev/null +++ b/target/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/target/android/app/src/main/res/drawable/ic_launcher_background.xml b/target/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..0d025f9b --- /dev/null +++ b/target/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/target/android/app/src/main/res/layout/activity_main.xml b/target/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..fd930106 --- /dev/null +++ b/target/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/target/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/target/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/target/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/target/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/target/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/target/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/target/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/target/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..898f3ed5 Binary files /dev/null and b/target/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/target/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/target/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..dffca360 Binary files /dev/null and b/target/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/target/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/target/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..64ba76f7 Binary files /dev/null and b/target/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/target/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/target/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..dae5e082 Binary files /dev/null and b/target/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/target/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/target/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..e5ed4659 Binary files /dev/null and b/target/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/target/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/target/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..14ed0af3 Binary files /dev/null and b/target/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/target/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/target/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..b0907cac Binary files /dev/null and b/target/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/target/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/target/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..d8ae0315 Binary files /dev/null and b/target/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/target/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/target/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..2c18de9e Binary files /dev/null and b/target/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/target/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/target/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..beed3cdd Binary files /dev/null and b/target/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/target/android/app/src/main/res/values/colors.xml b/target/android/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..69b22338 --- /dev/null +++ b/target/android/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #008577 + #00574B + #D81B60 + diff --git a/target/android/app/src/main/res/values/strings.xml b/target/android/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..0057fcb9 --- /dev/null +++ b/target/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Example + diff --git a/target/android/app/src/main/res/values/styles.xml b/target/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..5885930d --- /dev/null +++ b/target/android/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/target/android/build.gradle b/target/android/build.gradle new file mode 100644 index 00000000..7d6d18db --- /dev/null +++ b/target/android/build.gradle @@ -0,0 +1,29 @@ +// 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.5.2' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + maven { + url "https://dl.bintray.com/osborn/Android" + } + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/target/android/gradle.properties b/target/android/gradle.properties new file mode 100644 index 00000000..199d16ed --- /dev/null +++ b/target/android/gradle.properties @@ -0,0 +1,20 @@ +# 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. +org.gradle.jvmargs=-Xmx1536m +# 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 +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true + diff --git a/target/android/gradle/wrapper/gradle-wrapper.jar b/target/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..f6b961fd Binary files /dev/null and b/target/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/target/android/gradle/wrapper/gradle-wrapper.properties b/target/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..5d85a8fd --- /dev/null +++ b/target/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Dec 05 19:41:10 CST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/target/android/gradlew b/target/android/gradlew new file mode 100755 index 00000000..cccdd3d5 --- /dev/null +++ b/target/android/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# 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 +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +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" -a "$nonstop" = "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"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # 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 + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/target/android/gradlew.bat b/target/android/gradlew.bat new file mode 100644 index 00000000..e95643d6 --- /dev/null +++ b/target/android/gradlew.bat @@ -0,0 +1,84 @@ +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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/target/android/settings.gradle b/target/android/settings.gradle new file mode 100644 index 00000000..99698ff7 --- /dev/null +++ b/target/android/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name='Example' diff --git a/contents/$.ts b/target/js/$.ts similarity index 94% rename from contents/$.ts rename to target/js/$.ts index 0d63958d..0fb32b89 100644 --- a/contents/$.ts +++ b/target/js/$.ts @@ -13,7 +13,7 @@ class __$__ extends Panel { text({ text: "Click to count", textSize: 20, - bgColor: Color.parse('#70a1ff'), + backgroundColor: Color.parse('#70a1ff'), textColor: Color.WHITE, onClick: () => { number.text = `${++count}` diff --git a/contents/_gitignore b/target/js/_gitignore similarity index 100% rename from contents/_gitignore rename to target/js/_gitignore diff --git a/contents/_launch.json b/target/js/_launch.json similarity index 100% rename from contents/_launch.json rename to target/js/_launch.json diff --git a/contents/_package.json b/target/js/_package.json similarity index 95% rename from contents/_package.json rename to target/js/_package.json index d8812de4..2b9ff2ca 100644 --- a/contents/_package.json +++ b/target/js/_package.json @@ -10,7 +10,7 @@ }, "license": "Apache-2.0", "dependencies": { - "doric": "0.1.0", + "doric": "0.1.1", "reflect-metadata": "^0.1.13", "rollup": "^1.17.0", "rollup-plugin-commonjs": "^10.0.1", diff --git a/contents/_rollup.config.js b/target/js/_rollup.config.js similarity index 100% rename from contents/_rollup.config.js rename to target/js/_rollup.config.js diff --git a/contents/_tasks.json b/target/js/_tasks.json similarity index 100% rename from contents/_tasks.json rename to target/js/_tasks.json diff --git a/contents/_tsconfig.json b/target/js/_tsconfig.json similarity index 100% rename from contents/_tsconfig.json rename to target/js/_tsconfig.json