Added dynamic library support & menu stuff

- Added a new class that does the actual generation of the new library
descriptor file
- Added upgraded menu
- Updated PropCCompiler library with the updated library paths

Author: DarkmatterVale

BlocklyPropClient.py

@@ -11,6 +11,7 @@
 import os
 import ip
 import BlocklyServer
+from PropC_library_finder import propc_library_finder
 
 PORT = 6009
 VERSION = 0.2
@@ -42,23 +43,13 @@ def __init__(self, *args, **kwargs):
             pass
 
         self.initialize()
+        self.initialize_menu()
 
     def set_version(self, version):
         self.version = version
 
     def initialize(self):
         self.grid()
-        
-        self.menubar = tk.Menu()
-        
-        self.about_menu = tk.Menu( self.menubar, tearoff=0 )
-        
-        self.about_menu.add_command( label="BlocklyPropClient Source Code", command=self.handle_client_code_browser )
-        self.about_menu.add_command( label="BlocklyProp Source Code", command=self.handle_code_browser )
-        self.about_menu.add_separator()
-        self.about_menu.add_command( label="About", command=self.about_info )
-        
-        self.menubar.add_cascade( label="About", menu=self.about_menu)
 
         self.lbl_ip_address = tk.Label(self, anchor=tk.E, text='IP Address :')
         self.lbl_ip_address.grid(column=0, row=0, sticky='nesw')
@@ -99,7 +90,6 @@ def initialize(self):
         self.grid_rowconfigure(4, weight=1)
         self.resizable(True, True)
         self.minsize(250, 200)
-        self.config( menu=self.menubar )
 
         self.protocol("WM_DELETE_WINDOW", self.handle_close)
 
@@ -112,6 +102,32 @@ def initialize(self):
         monitor = threading.Thread(target=self.text_catcher)
         monitor.daemon = True
         monitor.start()
+    
+    def initialize_menu( self ):
+        menubar = tk.Menu( self )
+
+        file_menu = tk.Menu( menubar, tearoff=0 )
+        file_menu.add_command( label="Save" )
+        file_menu.add_command( label="Save As..." )
+        file_menu.add_command( label="Open" )
+        menubar.add_cascade( label="File", menu=file_menu )
+        
+        about_menu = tk.Menu( menubar, tearoff=0 )
+        about_menu.add_command( label="BlocklyPropClient Source Code", command=self.handle_client_code_browser )
+        about_menu.add_command( label="BlocklyProp Source Code", command=self.handle_code_browser )
+        about_menu.add_separator()
+        about_menu.add_command( label="About", command=self.about_info )
+        menubar.add_cascade( label="About", menu=about_menu)
+        
+        options_menu = tk.Menu( menubar, tearoff=0 )
+        options_menu.add_command( label="Set Library Location", command=self.handle_library_location )
+        menubar.add_cascade( label="Options", menu=options_menu )
+        
+        help_menu = tk.Menu( menubar, tearoff=0 )
+        help_menu.add_command( label="Help" )
+        menubar.add_cascade( label="Help", menu=help_menu )
+    
+        self.config( menu=menubar )
 
     def handle_connect(self):
         if self.connected:
@@ -137,6 +153,11 @@ def handle_code_browser( self ):
     def handle_client_code_browser( self ):
         webbrowser.open_new( 'http://github.com/parallaxinc/BlocklyPropClient' )
 
+    def handle_library_location( self ):
+        library_finder = propc_library_finder()
+            
+        tkMessageBox.showinfo( "Info", "Library Location Set To: " + library_finder.get_directory() )
+    
     def about_info( self ):
         tkMessageBox.showinfo( "About BlocklyProp", "CurrentVersion: v0.2.0\n\nAuthors: Vale Tolpegin & Michel Lampo\n\nRepository Source Code: http://github.com/parallaxinc/BlocklyPropClient\n\nCopyright 2015 Parallax Inc" )
 

PropCCompiler.py

@@ -91,6 +91,9 @@ def compile(self, action, code):
 
     def get_includes(self, includes):
         global lib_descriptor
+        
+        lib_descriptor = json.load(open(os.getcwd() + "/lib-descriptor.json"))
+        
         descriptors = []
         for include in includes:
             for descriptor in lib_descriptor:
@@ -112,14 +115,13 @@ def parse_includes(self, c_file):
 
     def create_executing_data(self, c_file, binary_file, descriptors):
         executable = self.compiler_executables[platform.system()]
-        lib_directory = self.appdir + "/propeller-c-lib/"
 
         executing_data = [executable]
         for descriptor in descriptors:
             executing_data.append("-I")
-            executing_data.append(lib_directory + descriptor["libdir"])
+            executing_data.append(descriptor["libdir"])
             executing_data.append("-L")
-            executing_data.append(lib_directory + descriptor["memorymodel"]["cmm"])
+            executing_data.append(descriptor["memorymodel"]["cmm"])
         executing_data.append("-Os")
         executing_data.append("-mcmm")
         executing_data.append("-m32bit-doubles")
@@ -137,4 +139,7 @@ def create_executing_data(self, c_file, binary_file, descriptors):
         return executing_data
 
 
-lib_descriptor = json.load(open(os.getcwd() + "/propeller-c-lib/lib-descriptor.json"))
+try:
+    lib_descriptor = json.load(open(os.getcwd() + "/propeller-c-lib/lib-descriptor.json"))
+except:
+    lib_descriptor = json.load(open(os.getcwd() + "/lib-descriptor.json"))

PropC_library_finder.py

@@ -0,0 +1,107 @@
+__author__ = 'Vale'
+
+import platform
+import os
+import json
+import subprocess
+import re
+import tkMessageBox
+import tkFileDialog
+from tkCommonDialog import Dialog
+
+class propc_library_finder:
+    library_path = ""
+    
+    def __init__( self, *args, **kwargs ):
+        self.find_libraries()
+        output = self.assemble_information()
+        self.create_json_file( output, "lib-descriptor.json" )
+    
+    def get_directory( self ):
+        global library_path
+    
+        return library_path
+    
+    def find_libraries( self ):
+        global library_path
+        
+        file_path = self.askdirectory()
+    
+        library_path = file_path
+
+    def get_subdirectories( self, path ):
+        return os.listdir( path )
+
+    def get_files_in_directory( self, path ):
+        files = []
+        
+        for file in os.listdir( path ):
+            if isfile( file ):
+                files[ file ] = file
+
+        return files
+    
+    def assemble_information( self ):
+        global library_path
+        output = "[\n"
+    
+        #get directories
+        directories = self.get_subdirectories( library_path )
+        
+        for directory in directories:
+            directory_path = library_path + "/" + directory + "/"
+            
+            #get subdirectories of that directory
+            try:
+                sub_directories = self.get_subdirectories( directory_path )
+            
+                for sub_directory in sub_directories:
+                    if ( "." not in sub_directory ):
+                        sub_directory_name = re.sub( "lib", "", sub_directory )
+                        sub_directory_path = directory_path + sub_directory
+                
+                        output += '\t{\n\t\t'
+                        output += '"name": "' + sub_directory_name + '",\n\t\t'
+                        output += '"libdir": "' + sub_directory_path + '",\n\t\t'
+                        output += '"include": [\n\t\t\t' + '"' + sub_directory_name + '"'
+                        output += '\n\t\t],\n\t\t'
+                        output += '"memorymodel": {\n\t\t\t"cmm": "' + sub_directory_path + '/cmm/"' + '\n\t\t}\n\t},\n'
+            except:
+                pass
+    
+        output = output[:len(output) - 2]
+        output += '\n]'
+        
+        return output
+
+    def create_json_file( self, data, file_name ):
+        file = open( file_name, 'w' )
+        file.write( data )
+        file.close()
+    
+        #json.dump( unicode( data ), file_name )
+        print json.load(open(os.getcwd() + "/lib-descriptor.json"))
+    
+    def askdirectory(self, **options):
+        "Ask for a directory name"
+        
+        return apply(self.Chooser, (), options).show()
+
+    class Chooser(Dialog):
+    
+        command = "tk_chooseDirectory"
+        
+        def _fixresult(self, widget, result):
+            if result:
+                # keep directory until next time
+                self.options["initialdir"] = result
+            self.directory = result # compatibility
+            return result
+
+    #
+    # convenience stuff
+
+if __name__ == '__main__':
+    tkMessageBox.showinfo( "ERROR", "This program cannot be run as a standalone application" )
+
+    #library_finder_test = propc_library_finder()