[DEV] correct some interface

MANIFEST.in

@@ -1 +1,2 @@
 include README.rst
+include bash-autocompletion/lutin

bash-autocompletion/lutin

@@ -61,7 +61,7 @@ _lutin()
 			return 0
 			;;
 		--target)
-			local names=`lutin.py --list-target`
+			local names=`lutin --list-target`
 			COMPREPLY=( $(compgen -W "${names}" -- ${cur}) )
 			return 0
 			;;
@@ -82,9 +82,9 @@ _lutin()
 		COMPREPLY=( $(compgen -W "${optshorts}" -- ${cur}) )
 		return 0
 	fi
-	listmodule=`lutin.py --list-module`
+	listmodule=`lutin --list-module`
 	COMPREPLY=( $(compgen -W "${listmodule}" -- ${cur}) )
 	return 0
 }
 
-complete -F _lutin lutin.py
+complete -F _lutin lutin

bash-autocompletion/readme

@@ -1,6 +1,6 @@
 
 to install autocompletion for lutin :
 
-sudo cp bash-autocompletion/lutin.py /etc/bash_completion.d
+sudo cp bash-autocompletion/lutin /etc/bash_completion.d
 
 ==> and restart bash ...

bin/lutin

@@ -15,6 +15,7 @@ import lutin.arg as arguments
 import lutin.host as host
 import lutin.module as module
 import lutin.target as target
+import lutin.env as env
 import lutin.multiprocess as multiprocess
 
 myArgs = arguments.LutinArg()
@@ -106,15 +107,15 @@ def parseGenericArg(argument, active):
 		return True
 	elif argument.get_option_nName() == "force":
 		if active==True:
-			lutinEnv.set_force_mode(True)
+			env.set_force_mode(True)
 		return True
 	elif argument.get_option_nName() == "pretty":
 		if active==True:
-			lutinEnv.set_print_pretty_mode(True)
+			env.set_print_pretty_mode(True)
 		return True
 	elif argument.get_option_nName() == "force-strip":
 		if active==True:
-			lutinEnv.set_force_strip_mode(True)
+			env.set_force_strip_mode(True)
 		return True
 	return False
 

lutin/z_target/lutinTarget_Android.py

@@ -608,14 +608,14 @@ class Target(target.Target):
 		filesString=""
 		for element in pkgProperties["ANDROID_JAVA_FILES"]:
 			if element=="DEFAULT":
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/EwolAudioTask.java "
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/EwolCallback.java "
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/EwolConstants.java "
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/Ewol.java "
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/EwolRendererGL.java "
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/EwolSurfaceViewGL.java "
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/EwolActivity.java "
-				filesString += self.folder_ewol + "/sources/android/src/org/ewol/EwolWallpaper.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/EwolAudioTask.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/EwolCallback.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/EwolConstants.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/Ewol.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/EwolRendererGL.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/EwolSurfaceViewGL.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/EwolActivity.java "
+				filesString += self.folder_ewol + "/android/src/org/ewol/EwolWallpaper.java "
 			else:
 				filesString += element + " "
 		

lutin/z_target/lutinTarget_IOs.py

@@ -54,11 +54,11 @@ class Target(target.Target):
 		self.suffix_binary=''
 		self.suffix_package=''
 		if self.sumulator == True:
-			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator8.1.sdk"
+			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator8.3.sdk"
 			self.global_flags_ld.append("-mios-simulator-version-min=8.0")
 			self.global_flags_cc.append("-mios-simulator-version-min=8.0")
 		else:
-			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.1.sdk"
+			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk"
 			self.global_flags_ld.append("-miphoneos-version-min=8.0")
 			self.global_flags_cc.append("-miphoneos-version-min=8.0")
 
@@ -315,7 +315,10 @@ class Target(target.Target):
 			tmpFile.write("<plist version=\"1.0\">\n")
 			tmpFile.write("    <dict>\n")
 			tmpFile.write("        <key>application-identifier</key>\n")
-			tmpFile.write("        <string>" + pkgProperties["APPLE_APPLICATION_IOS_ID"] + "." + pkgProperties["COMPAGNY_TYPE"] + "." + pkgProperties["COMPAGNY_NAME2"] + "." + pkgName + "</string>\n")
+			try:
+				tmpFile.write("        <string>" + pkgProperties["APPLE_APPLICATION_IOS_ID"] + "." + pkgProperties["COMPAGNY_TYPE"] + "." + pkgProperties["COMPAGNY_NAME2"] + "." + pkgName + "</string>\n")
+			except:
+				debug.error("Missing package property : APPLE_APPLICATION_IOS_ID")
 			tmpFile.write("        <key>get-task-allow</key>\n")
 			tmpFile.write("        <true/>\n")
 			tmpFile.write("        <key>keychain-access-groups</key>\n")

lutin/z_target/lutinTarget_MacOs.py

@@ -11,8 +11,10 @@ from lutin import debug
 from lutin import target
 from lutin import tools
 from lutin import host
+from lutin import multiprocess
 import os
 import stat
+import shutil
 
 class Target(target.Target):
 	def __init__(self, config):
@@ -82,23 +84,52 @@ class Target(target.Target):
 		tmpFile.flush()
 		tmpFile.close()
 		
-		# Must create the tarball of the application 
-		#cd $(TARGET_OUT_FINAL)/; tar -cf $(PROJECT_NAME).tar $(PROJECT_NAME).app
-		#cd $(TARGET_OUT_FINAL)/; tar -czf $(PROJECT_NAME).tar.gz $(PROJECT_NAME).app
+		# Create a simple interface to localy install the aplication for the shell (a shell command line interface)
+		shell_file_name=self.get_staging_folder(pkgName) + "/shell/" + pkgName
+		# Create the info file
+		tools.create_directory_of_file(shell_file_name)
+		tmpFile = open(shell_file_name, 'w')
+		tmpFile.write("#!/bin/bash\n")
+		tmpFile.write("# Simply open the real application in the correct way (a link does not work ...)\n")
+		tmpFile.write("/Applications/" + pkgName + ".app/Contents/MacOS/" + pkgName + " $*\n")
+		#tmpFile.write("open -n /Applications/edn.app --args -AppCommandLineArg $*\n")
+		tmpFile.flush()
+		tmpFile.close()
+		
+		
+		# Must create the disk image of the application 
+		debug.info("Generate disk image for '" + pkgName + "'")
+		output_file_name = self.get_final_folder() + "/" + pkgName + ".dmg"
+		cmd = "hdiutil create -volname "
+		cmd += pkgName + " -srcfolder "
+		cmd += tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + pkgName + ".app"
+		cmd += " -ov -format UDZO "
+		cmd += output_file_name
+		tools.create_directory_of_file(output_file_name)
+		multiprocess.run_command_direct(cmd)
+		debug.info("disk image: " + output_file_name)
+		
+		debug.info("You can have an shell interface by executing : ")
+		debug.info("    sudo cp " + shell_file_name + " /usr/local/bin")
 	
 	def install_package(self, pkgName):
 		debug.debug("------------------------------------------------------------------------")
 		debug.info("Install package '" + pkgName + "'")
 		debug.debug("------------------------------------------------------------------------")
-		debug.warning("    ==> TODO")
-		#sudo dpkg -i $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package
+		debug.info("copy " + tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + pkgName + ".app in /Applications/")
+		if os.path.exists("/Applications/" + pkgName + ".app") == True:
+			shutil.rmtree("/Applications/" + pkgName + ".app")
+		# copy the application in the basic application folder : /Applications/xxx.app
+		shutil.copytree(tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + pkgName + ".app", "/Applications/" + pkgName + ".app")
 	
 	def un_install_package(self, pkgName):
 		debug.debug("------------------------------------------------------------------------")
 		debug.info("Un-Install package '" + pkgName + "'")
 		debug.debug("------------------------------------------------------------------------")
-		debug.warning("    ==> TODO")
-		#sudo dpkg -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package
+		debug.info("remove OLD application /Applications/" + pkgName + ".app")
+		# Remove the application in the basic application folder : /Applications/xxx.app
+		if os.path.exists("/Applications/" + pkgName + ".app") == True:
+			shutil.rmtree("/Applications/" + pkgName + ".app")
 
 
 

setup.py

@@ -7,7 +7,7 @@ def readme():
 
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 setup(name='lutin',
-      version='0.5.4',
+      version='0.5.12',
       description='Lutin generic builder',
       long_description=readme(),
       url='http://github.com/HeeroYui/lutin',
@@ -15,10 +15,9 @@ setup(name='lutin',
       author_email='yui.heero@gmail.com',
       license='APACHE-2',
       packages=['lutin',
-                'lutin/builder',
-                'lutin/system',
-                'lutin/target'
-               ],
+                'lutin/z_builder',
+                'lutin/z_system',
+                'lutin/z_target'],
       classifiers=[
         'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: Apache Software License',
@@ -27,7 +26,13 @@ setup(name='lutin',
       ],
       keywords='builder c++ c android ios macos makefile cmake',
       scripts=['bin/lutin'],
+      data_file=[
+          ('/etc/bash_completion.d', ['bash-autocompletion/lutin']),
+      ],
       include_package_data = True,
+      install_requires=[
+          'PIL>=1.0.0'
+      ],
       zip_safe=False)
 
 #To developp: ./setup.py install/develop