From 4e7e20db1ec1d8040e5d13dc82463d62adb3726c Mon Sep 17 00:00:00 2001
From: Joshua Granick <joshua@joshuagranick.com>
Date: Mon, 13 May 2013 13:29:12 -0700
Subject: [PATCH] Fix resolution of project/extension/bin template files, add
 support for certificate values (--certificate-path="", etc) from command-line

---
 include.xml                                   |   2 +-
 project/Keystore.hx                           |   4 +-
 project/NMEProject.hx                         |   2 +-
 src/CommandLineTools.hx                       |  10 +--
 {bin => templates/bin}/ReplaceVistaIcon.exe   | Bin
 {bin => templates/bin}/compiler.jar           | Bin
 {bin => templates/bin}/debug.keystore         | Bin
 {bin => templates/bin}/debug.p12              | Bin
 {bin => templates/bin}/fruitstrap             | Bin
 {bin => templates/bin}/hxswfml.n              | Bin
 {bin => templates/bin}/ios-sim                | Bin
 {bin => templates/bin}/nme.bat                |   0
 {bin => templates/bin}/nme.sh                 |   0
 .../bin}/yuicompressor-2.4.7.jar              | Bin
 templates/extension/Extension.hx              |  23 +++++++
 templates/extension/haxelib.xml               |   5 ++
 templates/extension/include.nmml              |   6 ++
 templates/extension/project/Build.xml         |  46 ++++++++++++++
 .../extension/project/common/Extension.cpp    |  14 +++++
 .../project/common/ExternalInterface.cpp      |  33 ++++++++++
 templates/extension/project/include/Utils.h   |  14 +++++
 templates/project/Assets/nme.svg              |  17 ++++++
 templates/project/Project.hxproj              |  57 ++++++++++++++++++
 templates/project/Source/Main.hx              |  13 ++++
 templates/project/project.nmml                |  14 +++++
 25 files changed, 251 insertions(+), 9 deletions(-)
 rename {bin => templates/bin}/ReplaceVistaIcon.exe (100%)
 rename {bin => templates/bin}/compiler.jar (100%)
 rename {bin => templates/bin}/debug.keystore (100%)
 rename {bin => templates/bin}/debug.p12 (100%)
 rename {bin => templates/bin}/fruitstrap (100%)
 rename {bin => templates/bin}/hxswfml.n (100%)
 rename {bin => templates/bin}/ios-sim (100%)
 rename {bin => templates/bin}/nme.bat (100%)
 rename {bin => templates/bin}/nme.sh (100%)
 rename {bin => templates/bin}/yuicompressor-2.4.7.jar (100%)
 create mode 100644 templates/extension/Extension.hx
 create mode 100644 templates/extension/haxelib.xml
 create mode 100644 templates/extension/include.nmml
 create mode 100644 templates/extension/project/Build.xml
 create mode 100644 templates/extension/project/common/Extension.cpp
 create mode 100644 templates/extension/project/common/ExternalInterface.cpp
 create mode 100644 templates/extension/project/include/Utils.h
 create mode 100644 templates/project/Assets/nme.svg
 create mode 100644 templates/project/Project.hxproj
 create mode 100644 templates/project/Source/Main.hx
 create mode 100644 templates/project/project.nmml

diff --git a/include.xml b/include.xml
index ee76d80..fcf4060 100644
--- a/include.xml
+++ b/include.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension>
 	
-	<template path="" />
+	<template path="templates" />
 	
 </extension>
\ No newline at end of file
diff --git a/project/Keystore.hx b/project/Keystore.hx
index 1217b3c..3090afc 100644
--- a/project/Keystore.hx
+++ b/project/Keystore.hx
@@ -9,7 +9,7 @@ class Keystore {
 	public var path:String;
 	public var type:String;
 	
-	public function new (path:String, password:String = null, alias:String = null, aliasPassword:String = null) {
+	public function new (path:String = null, password:String = null, alias:String = null, aliasPassword:String = null) {
 		
 		this.path = path;
 		this.password = password;
@@ -28,7 +28,7 @@ class Keystore {
 		
 		if (keystore != null) {
 			
-			if (keystore.path != "") path = keystore.path;
+			if (keystore.path != null && keystore.path != "") path = keystore.path;
 			if (keystore.password != null) path = keystore.password;
 			if (keystore.alias != null) path = keystore.alias;
 			if (keystore.aliasPassword != null) path = keystore.aliasPassword;
diff --git a/project/NMEProject.hx b/project/NMEProject.hx
index 53a97bf..3fb0e33 100644
--- a/project/NMEProject.hx
+++ b/project/NMEProject.hx
@@ -444,7 +444,7 @@ class NMEProject {
 				
 			} else {
 				
-				ObjectHelper.copyUniqueFields (project.certificate, certificate, null);
+				certificate.merge (project.certificate);
 				
 			}
 			
diff --git a/src/CommandLineTools.hx b/src/CommandLineTools.hx
index 89e8917..f8039cb 100644
--- a/src/CommandLineTools.hx
+++ b/src/CommandLineTools.hx
@@ -214,7 +214,7 @@ class CommandLineTools {
 				}
 				
 				PathHelper.mkdir (title);
-				FileHelper.recursiveCopyTemplate ([ nme + "/templates/default" ], "project", title, context);
+				FileHelper.recursiveCopyTemplate ([ PathHelper.getHaxelib (new Haxelib ("pazu-tools")) + "/templates" ], "project", title, context);
 				
 				if (FileSystem.exists (title + "/Project.hxproj")) {
 					
@@ -244,7 +244,7 @@ class CommandLineTools {
 				context.extensionUpperCase = extension.toUpperCase ();
 				
 				PathHelper.mkdir (title);
-				FileHelper.recursiveCopyTemplate ([ nme + "/templates/default" ], "extension", title, context);
+				FileHelper.recursiveCopyTemplate ([ PathHelper.getHaxelib (new Haxelib ("pazu-tools"))  + "/templates" ], "extension", title, context);
 				
 				if (FileSystem.exists (title + "/Extension.hx")) {
 					
@@ -881,9 +881,9 @@ class CommandLineTools {
 			}
 			
 			if (field == "template" && attribute == "path") {
-						
+				
 				project.templatePaths.push (projectDefines.get (key));
-						
+				
 			} else {
 				
 				if (Reflect.hasField (project, field)) {
@@ -1140,7 +1140,7 @@ class CommandLineTools {
 						
 						if (overrides.certificate == null) {
 							
-							overrides.certificate = new Keystore ("");
+							overrides.certificate = new Keystore ();
 							
 						}
 						
diff --git a/bin/ReplaceVistaIcon.exe b/templates/bin/ReplaceVistaIcon.exe
similarity index 100%
rename from bin/ReplaceVistaIcon.exe
rename to templates/bin/ReplaceVistaIcon.exe
diff --git a/bin/compiler.jar b/templates/bin/compiler.jar
similarity index 100%
rename from bin/compiler.jar
rename to templates/bin/compiler.jar
diff --git a/bin/debug.keystore b/templates/bin/debug.keystore
similarity index 100%
rename from bin/debug.keystore
rename to templates/bin/debug.keystore
diff --git a/bin/debug.p12 b/templates/bin/debug.p12
similarity index 100%
rename from bin/debug.p12
rename to templates/bin/debug.p12
diff --git a/bin/fruitstrap b/templates/bin/fruitstrap
similarity index 100%
rename from bin/fruitstrap
rename to templates/bin/fruitstrap
diff --git a/bin/hxswfml.n b/templates/bin/hxswfml.n
similarity index 100%
rename from bin/hxswfml.n
rename to templates/bin/hxswfml.n
diff --git a/bin/ios-sim b/templates/bin/ios-sim
similarity index 100%
rename from bin/ios-sim
rename to templates/bin/ios-sim
diff --git a/bin/nme.bat b/templates/bin/nme.bat
similarity index 100%
rename from bin/nme.bat
rename to templates/bin/nme.bat
diff --git a/bin/nme.sh b/templates/bin/nme.sh
similarity index 100%
rename from bin/nme.sh
rename to templates/bin/nme.sh
diff --git a/bin/yuicompressor-2.4.7.jar b/templates/bin/yuicompressor-2.4.7.jar
similarity index 100%
rename from bin/yuicompressor-2.4.7.jar
rename to templates/bin/yuicompressor-2.4.7.jar
diff --git a/templates/extension/Extension.hx b/templates/extension/Extension.hx
new file mode 100644
index 0000000..a1c136e
--- /dev/null
+++ b/templates/extension/Extension.hx
@@ -0,0 +1,23 @@
+package;
+
+#if cpp
+import cpp.Lib;
+#elseif neko
+import neko.Lib;
+#end
+
+
+class ::className:: {
+	
+	
+	public static function sampleMethod (inputValue:Int):Int {
+		
+		return ::extensionLowerCase::_sample_method(inputValue);
+		
+	}
+	
+	
+	private static var ::extensionLowerCase::_sample_method = Lib.load ("::file::", "::extensionLowerCase::_sample_method", 1);
+	
+	
+}
\ No newline at end of file
diff --git a/templates/extension/haxelib.xml b/templates/extension/haxelib.xml
new file mode 100644
index 0000000..67a5bab
--- /dev/null
+++ b/templates/extension/haxelib.xml
@@ -0,0 +1,5 @@
+<project name="::extension::" url="" license="MIT">
+	<user name=""/>
+	<description></description>
+	<version name="1.0.0"></version>
+</project>
\ No newline at end of file
diff --git a/templates/extension/include.nmml b/templates/extension/include.nmml
new file mode 100644
index 0000000..0c18ed5
--- /dev/null
+++ b/templates/extension/include.nmml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+	
+	<ndll name="::file::" />
+	
+</project>
\ No newline at end of file
diff --git a/templates/extension/project/Build.xml b/templates/extension/project/Build.xml
new file mode 100644
index 0000000..42f3acc
--- /dev/null
+++ b/templates/extension/project/Build.xml
@@ -0,0 +1,46 @@
+<xml>
+	
+	<include name="${HXCPP}/build-tool/BuildCommon.xml"/>
+	
+	<set name="mobile" value="1" if="iphone"/>
+	<set name="mobile" value="1" if="android"/>
+	<set name="mobile" value="1" if="blackberry"/>
+	<set name="mobile" value="1" if="webos"/>
+	
+	<files id="common">
+		
+		<compilerflag value="-Iinclude"/>
+		
+		<file name="common/ExternalInterface.cpp"/>
+		<file name="common/::file::.cpp"/>
+		
+	</files>
+	
+	<set name="name_prefix" value="lib" if="iphone"/>
+	<set name="IOS_ARCH" value="-v7" if="HXCPP_ARMV7"/>
+	<set name="name_extra" value=".iphoneos${IOS_ARCH}" if="iphoneos"/>
+	<set name="name_extra" value=".iphonesim" if="iphonesim"/>
+	<set name="name_extra" value="-x86" if="simulator" unless="iphonesim" />
+	<set name="tool" value="exe" unless="iphone"/>
+	<set name="tool" value="static" if="iphone"/>
+	<set name="ndll-tool" value="dll" unless="iphone"/>
+	<set name="ndll-tool" value="static" if="iphone"/>
+	<set name="SLIBEXT" value=".lib" if="windows"/>
+	<set name="SLIBEXT" value=".a" unless="windows"/>
+	<set name="SLIBEXT" value=".so" if="webos"/>
+	
+	<target id="NDLL" output="${name_prefix}::file::${debug_extra}${name_extra}" tool="linker" toolid="${ndll-tool}">
+		
+		<outdir name="../ndll/${BINDIR}"/>
+		<ext value=".ndll" unless="mobile"/>
+		<files id="common"/>
+		
+	</target>
+	
+	<target id="default">
+		
+		<target id="NDLL"/>
+		
+	</target>
+	
+</xml>
\ No newline at end of file
diff --git a/templates/extension/project/common/Extension.cpp b/templates/extension/project/common/Extension.cpp
new file mode 100644
index 0000000..d89b067
--- /dev/null
+++ b/templates/extension/project/common/Extension.cpp
@@ -0,0 +1,14 @@
+#include "Utils.h"
+
+
+namespace ::extensionLowerCase:: {
+	
+	
+	int SampleMethod(int inputValue) {
+		
+		return inputValue * 100;
+		
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/templates/extension/project/common/ExternalInterface.cpp b/templates/extension/project/common/ExternalInterface.cpp
new file mode 100644
index 0000000..ae65fb9
--- /dev/null
+++ b/templates/extension/project/common/ExternalInterface.cpp
@@ -0,0 +1,33 @@
+#ifndef STATIC_LINK
+#define IMPLEMENT_API
+#endif
+
+#if defined(HX_WINDOWS) || defined(HX_MACOS) || defined(HX_LINUX)
+#define NEKO_COMPATIBLE
+#endif
+
+
+#include <hx/CFFI.h>
+#include "Utils.h"
+
+
+using namespace ::extensionLowerCase::;
+
+
+
+static value ::extensionLowerCase::_sample_method (value inputValue) {
+	
+	int returnValue = SampleMethod(val_int(inputValue));
+	return alloc_int(returnValue);
+	
+}
+DEFINE_PRIM (::extensionLowerCase::_sample_method, 1);
+
+
+
+extern "C" void ::extensionLowerCase::_main () {}
+DEFINE_ENTRY_POINT (::extensionLowerCase::_main);
+
+
+
+extern "C" int ::extensionLowerCase::_register_prims () { return 0; }
\ No newline at end of file
diff --git a/templates/extension/project/include/Utils.h b/templates/extension/project/include/Utils.h
new file mode 100644
index 0000000..d9141d1
--- /dev/null
+++ b/templates/extension/project/include/Utils.h
@@ -0,0 +1,14 @@
+#ifndef ::extensionUpperCase::_H
+#define ::extensionUpperCase::_H
+
+
+namespace ::extensionLowerCase:: {
+	
+	
+	int SampleMethod(int inputValue);
+	
+	
+}
+
+
+#endif
\ No newline at end of file
diff --git a/templates/project/Assets/nme.svg b/templates/project/Assets/nme.svg
new file mode 100644
index 0000000..506f61d
--- /dev/null
+++ b/templates/project/Assets/nme.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<g transform="scale(.125,.125)">
+	<rect fill="#F05A22" width="256" height="256"/>
+	<rect x="198.4" y="89.6" fill="#FCB813" width="57.6" height="25.601"/>
+	<rect x="198.4" y="115.2" fill="#FFF100" width="57.6" height="25.601"/>
+	<rect x="198.4" y="140.801" fill="#FCB813" width="57.6" height="25.6"/>
+	<polygon fill="#FCB813" points="0,89.6 76.801,166.4 102.4,166.4 102.4,140.801 51.201,89.6 	"/>
+	<polygon fill="#FFF100" points="189.439,104.96 153.6,140.801 153.6,166.4 189.439,166.4 	"/>
+	<polygon fill="#FCB813" points="153.6,89.6 189.439,89.6 189.439,104.96 153.6,140.801 128,115.2 	"/>
+	<polygon fill="#FFF100" points="0,89.6 35.841,125.441 35.841,166.4 0,166.4 	"/>
+	<polygon fill="#FFF100" points="102.4,89.6 76.801,89.6 76.801,115.2 128,166.4 153.6,140.801 	"/>
+</g>
+</svg>
diff --git a/templates/project/Project.hxproj b/templates/project/Project.hxproj
new file mode 100644
index 0000000..cc85f55
--- /dev/null
+++ b/templates/project/Project.hxproj
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project version="2">
+  <!-- Output SWF options -->
+  <output>
+    <movie outputType="Application" />
+    <movie input="" />
+    <movie path="project.nmml" />
+    <movie fps="30" />
+    <movie width="800" />
+    <movie height="600" />
+    <movie version="3" />
+    <movie minorVersion="0" />
+    <movie platform="NME" />
+    <movie background="#FFFFFF" />
+  </output>
+  <!-- Other classes to be compiled into your SWF -->
+  <classpaths>
+    <class path="Source" />
+  </classpaths>
+  <!-- Build options -->
+  <build>
+    <option directives="" />
+    <option flashStrict="False" />
+    <option mainClass="::packageName::" />
+    <option enabledebug="False" />
+    <option additional="" />
+  </build>
+  <!-- haxelib libraries -->
+  <haxelib>
+    <library name="nme" />
+    <library name="actuate" />
+  </haxelib>
+  <!-- Class files to compile (other referenced classes will automatically be included) -->
+  <compileTargets>
+    <!-- example: <compile path="..." /> -->
+  </compileTargets>
+  <!-- Assets to embed into the output SWF -->
+  <library>
+    <!-- example: <asset path="..." id="..." update="..." glyphs="..." mode="..." place="..." sharepoint="..." /> -->
+  </library>
+  <!-- Paths to exclude from the Project Explorer tree -->
+  <hiddenPaths>
+    <!-- example: <hidden path="..." /> -->
+  </hiddenPaths>
+  <!-- Executed before build -->
+  <preBuildCommand />
+  <!-- Executed after build -->
+  <postBuildCommand alwaysRun="False" />
+  <!-- Other project options -->
+  <options>
+    <option showHiddenPaths="False" />
+    <option testMovie="Custom" />
+    <option testMovieCommand="" />
+  </options>
+  <!-- Plugin storage -->
+  <storage />
+</project>
\ No newline at end of file
diff --git a/templates/project/Source/Main.hx b/templates/project/Source/Main.hx
new file mode 100644
index 0000000..f525706
--- /dev/null
+++ b/templates/project/Source/Main.hx
@@ -0,0 +1,13 @@
+import flash.display.Sprite;
+
+class Main extends Sprite {
+	
+	public function new () {
+		
+		super ();
+		
+		
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/templates/project/project.nmml b/templates/project/project.nmml
new file mode 100644
index 0000000..64825f1
--- /dev/null
+++ b/templates/project/project.nmml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+	
+	<meta title="::title::" package="::packageName::" version="::version::" company="::company::" />
+	<app main="Main" path="Export" file="::file::" />
+	
+	<source path="Source" />
+	
+	<haxelib name="pazu" />
+	
+	<assets path="Assets" rename="assets" exclude="nme.svg" />
+	<icon path="Assets/nme.svg" />
+	
+</project>
\ No newline at end of file