Merge branch 'feature/cbl_104_lib' into develop

mobile/ios/Classes/TDBridge.m

@@ -8,7 +8,6 @@
 
 #import "TDBridge.h"
 
-#import "TiCore.h"
 #import "KrollBridge.h"
 #import "KrollContext.h"
 #import "KrollMethod.h"

mobile/ios/build.py

@@ -9,7 +9,7 @@
 
 cwd = os.path.abspath(os.path.dirname(sys._getframe(0).f_code.co_filename))
 os.chdir(cwd)
-required_module_keys = ['name','version','moduleid','description','copyright','license','copyright','platform','minsdk']
+required_module_keys = ['architectures', 'name','version','moduleid','description','copyright','license','copyright','platform','minsdk']
 module_defaults = {
 	'description':'My module',
 	'author': 'Your Name',
@@ -49,6 +49,8 @@ def read_ti_xcconfig():
 
 def generate_doc(config):
 	docdir = os.path.join(cwd,'documentation')
+	if not os.path.exists(docdir):
+		docdir = os.path.join(cwd,'..','documentation')
 	if not os.path.exists(docdir):
 		print "Couldn't find documentation file at: %s" % docdir
 		return None
@@ -67,7 +69,9 @@ def generate_doc(config):
 	return documentation
 
 def compile_js(manifest,config):
-	js_file = os.path.join(cwd,'assets','foo.module.js')
+	js_file = os.path.join(cwd,'assets','com.foogle.js')
+	if not os.path.exists(js_file):
+		js_file = os.path.join(cwd,'..','assets','com.foogle.js')
 	if not os.path.exists(js_file): return
 
 	from compiler import Compiler
@@ -97,7 +101,7 @@ def compile_js(manifest,config):
 
 	from tools import splice_code
 
-	assets_router = os.path.join(cwd,'Classes','FooModuleModuleAssets.m')
+	assets_router = os.path.join(cwd,'Classes','ComFoogleModuleAssets.m')
 	splice_code(assets_router, 'asset', root_asset_content)
 	splice_code(assets_router, 'resolve_asset', module_asset_content)
 
@@ -114,9 +118,13 @@ def warn(msg):
 	print "[WARN] %s" % msg
 
 def validate_license():
-	c = open(os.path.join(cwd,'LICENSE')).read()
-	if c.find(module_license_default)!=-1:
-		warn('please update the LICENSE file with your license text before distributing')
+	license_file = os.path.join(cwd,'LICENSE')
+	if not os.path.exists(license_file):
+		license_file = os.path.join(cwd,'..','LICENSE')
+	if os.path.exists(license_file):
+		c = open(license_file).read()
+		if c.find(module_license_default)!=-1:
+			warn('please update the LICENSE file with your license text before distributing')
 
 def validate_manifest():
 	path = os.path.join(cwd,'manifest')
@@ -131,6 +139,7 @@ def validate_manifest():
 		manifest[key.strip()]=value.strip()
 	for key in required_module_keys:
 		if not manifest.has_key(key): die("missing required manifest key '%s'" % key)
+		if manifest[key].strip() == '': die("manifest key '%s' missing required value" % key)
 		if module_defaults.has_key(key):
 			defvalue = module_defaults[key]
 			curvalue = manifest[key]
@@ -140,7 +149,7 @@ def validate_manifest():
 ignoreFiles = ['.DS_Store','.gitignore','libTitanium.a','titanium.jar','README']
 ignoreDirs = ['.DS_Store','.svn','.git','CVSROOT']
 
-def zip_dir(zf,dir,basepath,ignore=[]):
+def zip_dir(zf,dir,basepath,ignore=[],includeJSFiles=False):
 	for root, dirs, files in os.walk(dir):
 		for name in ignoreDirs:
 			if name in dirs:
@@ -149,7 +158,7 @@ def zip_dir(zf,dir,basepath,ignore=[]):
 			if file in ignoreFiles: continue
 			e = os.path.splitext(file)
 			if len(e) == 2 and e[1] == '.pyc': continue
-			if len(e) == 2 and e[1] == '.js': continue
+			if not includeJSFiles and len(e) == 2 and e[1] == '.js': continue
 			from_ = os.path.join(root, file)
 			to_ = from_.replace(dir, basepath, 1)
 			zf.write(from_, to_)
@@ -179,6 +188,24 @@ def build_module(manifest,config):
 
 	os.system("lipo %s -create -output build/lib%s.a" %(libpaths,moduleid))
 
+def verify_build_arch(manifest, config):
+	binaryname = 'lib%s.a' % manifest['moduleid']
+	binarypath = os.path.join('build', binaryname)
+	manifestarch = set(manifest['architectures'].split(' '))
+
+	output = subprocess.check_output('xcrun lipo -info %s' % binarypath, shell=True)
+
+	builtarch = set(output.split(':')[-1].strip().split(' '))
+
+	if ('arm64' not in builtarch):
+		warn('built module is missing 64-bit support.')
+
+	if (manifestarch != builtarch):
+		warn('there is discrepancy between the architectures specified in module manifest and compiled binary.')
+		warn('architectures in manifest: %s' % ', '.join(manifestarch))
+		warn('compiled binary architectures: %s' % ', '.join(builtarch))
+		die('please update manifest to match module binary architectures.')
+
 def package_module(manifest,mf,config):
 	name = manifest['name'].lower()
 	moduleid = manifest['moduleid'].lower()
@@ -196,10 +223,26 @@ def package_module(manifest,mf,config):
 			for file, html in doc.iteritems():
 				filename = string.replace(file,'.md','.html')
 				zf.writestr('%s/documentation/%s'%(modulepath,filename),html)
-	for dn in ('assets','example','platform'):
-	  if os.path.exists(dn):
-		  zip_dir(zf,dn,'%s/%s' % (modulepath,dn),['README'])
-	zf.write('LICENSE','%s/LICENSE' % modulepath)
+
+	p = os.path.join(cwd, 'assets')
+	if not os.path.exists(p):
+		p = os.path.join(cwd, '..', 'assets')
+	if os.path.exists(p):
+		zip_dir(zf,p,'%s/%s' % (modulepath,'assets'),['README'])
+
+	for dn in ('example','platform'):
+		p = os.path.join(cwd, dn)
+		if not os.path.exists(p):
+			p = os.path.join(cwd, '..', dn)
+		if os.path.exists(p):
+			zip_dir(zf,p,'%s/%s' % (modulepath,dn),['README'],True)
+
+	license_file = os.path.join(cwd,'LICENSE')
+	if not os.path.exists(license_file):
+		license_file = os.path.join(cwd,'..','LICENSE')
+	if os.path.exists(license_file):
+		zf.write(license_file,'%s/LICENSE' % modulepath)
+
 	zf.write('module.xcconfig','%s/module.xcconfig' % modulepath)
 	exports_file = 'metadata.json'
 	if os.path.exists(exports_file):
@@ -218,6 +261,6 @@ def package_module(manifest,mf,config):
 
 	compile_js(manifest,config)
 	build_module(manifest,config)
+	verify_build_arch(manifest, config)
 	package_module(manifest,mf,config)
 	sys.exit(0)
-

mobile/ios/titanium.xcconfig

@@ -4,7 +4,7 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 3.5.0.GA
+TITANIUM_SDK_VERSION = 3.5.1.GA
 
 
 // 

mobile/noarch/testapp/Resources/replication_config_android.json

@@ -1,5 +1,5 @@
     {
-      "host": "10.8.17.21",
+      "host": "10.8.169.18",
       "port": 59840,
       "dbname": "elements"
     }

mobile/noarch/testapp/tiapp.xml

@@ -7,7 +7,7 @@
         <target device="blackberry">false</target>
         <target device="android">true</target>
     </deployment-targets>
-    <sdk-version>3.5.0.GA</sdk-version>
+    <sdk-version>3.5.1.GA</sdk-version>
     <id>com.obscure.titouchdb</id>
     <name>testapp</name>
     <version>1.0</version>