flak 0.0.8 → 0.0.9

data/lib/flak.rb

@@ -1,6 +1,7 @@
 require 'flak/version'
 
 require 'yaml'
+require 'json'
 require 'rake/clean'
 require 'find'
 require 'fileutils'

data/lib/flak/rake/os.rb

@@ -1,7 +1,7 @@
 module Flak
   # Provide a slightly nicer OS string than the 
   # RUBY_PLATFORM variable
-  # @return [String] Either 'linux_64', 'linux_32', 'darwin', or 'win_64'
+  # @return [String] Either 'linux64', 'linux32', 'darwin64', or 'win64'
   def self.os
     case RUBY_PLATFORM 
     when /64-linux/ 

data/lib/flak/rake/template_dsl.rb

@@ -8,11 +8,11 @@ Template.new('MayaApp') do
 
     maya_string =''
     case settings[:os]
-    when /linux_64/ 
+    when /linux64/ 
       maya_string = "maya#{settings[:maya_version]}-x64"
-    when /darwin/
+    when /darwin64/
       maya_string = "maya#{settings[:maya_version]}"
-    when /win_64/
+    when /win64/
       maya_string = "Maya#{settings[:maya_version]}"
     end
 
@@ -20,11 +20,11 @@ Template.new('MayaApp') do
 
     bind = binding()
     Flak::Errors.assert("settings[:autodesk_location]", "String", bind,__FILE__)
-    Flak::Errors.assert("settings[:path_to_revision]", "String", bind,__FILE__)
+    Flak::Errors.assert("settings[:revision_directory]", "String", bind,__FILE__)
     mods[:maya_location] =  File.join(   settings[:autodesk_location],maya_string )
 
 
-    mods[:maya_release_path] = File.join(  settings[:path_to_revision],"maya" )
+    mods[:maya_release_path] = File.join(  settings[:revision_directory],"maya" )
 
     mods
 

data/lib/flak/rake/templates/cpp.rb

@@ -25,8 +25,8 @@ module Flak::Template
 
       def release_filename 
         bind = binding()
-        Flak::Errors.assert("@settings[:path_to_revision]", "String", bind,__FILE__)
-        File.join( @settings[:path_to_revision], 'bin', build_filename.pathmap('%f'))   
+        Flak::Errors.assert("@settings[:revision_directory]", "String", bind,__FILE__)
+        File.join( @settings[:revision_directory], 'bin', build_filename.pathmap('%f'))   
       end
 
       # generate path to object file from source: e.g. /hq/dev/jtools/build/2009.3/darwin/debug/animal/sensor.o"
@@ -84,8 +84,8 @@ module Flak::Template
 
 
       def c_clean_cmd
-        objects = object_files.collect { |el| "\"#{el.to_s}\"" }
-        "rm -f \"#{build_filename}\" #{objects}"
+        object_str = object_files.collect { |el| "\"#{el.to_s}\"" }.join(" ")
+        "rm -f \"#{build_filename}\" #{object_str}"
       end
       ###################################################
 

data/lib/flak/rake/templates/delight.rb

@@ -57,9 +57,9 @@ module Flak::Template
 
       def shader_release_path(file)
         bind = binding()
-        Flak::Errors.assert("@settings[:path_to_revision]", "String", bind,__FILE__)
+        Flak::Errors.assert("@settings[:revision_directory]", "String", bind,__FILE__)
 
-        File.join(@settings[:path_to_revision] , 'delight','shader', file.pathmap('%f'))
+        File.join(@settings[:revision_directory] , 'delight','shader', file.pathmap('%f'))
       end
 
       def delight_shader_compile_cmd(dest,src)  

data/lib/flak/rake/templates/environment.rb

@@ -17,18 +17,18 @@ module Flak::Template
         bind = binding()
 
         Flak::Errors.assert("settings[:product_revision]", "String", bind,__FILE__)
-        Flak::Errors.assert("settings[:os]", "String", bind,__FILE__)
+        Flak::Errors.assert("settings[:platform_id]", "String", bind,__FILE__)
         Flak::Errors.assert("settings[:configuration]", "String", bind,__FILE__)
         Flak::Errors.assert("settings[:tools_directory]", "String", bind,__FILE__)
         Flak::Errors.assert("settings[:product_name]", "String", bind,__FILE__)
 
-        mods[:build_directory] = File.join( "build", settings[:product_revision] , settings[:os], settings[:configuration])
+        mods[:build_directory] = File.join( "build", settings[:product_revision] , settings[:platform_id], settings[:configuration])
 
-        mods[:release_root] = File.join(settings[:tools_directory], settings[:product_name])
+        mods[:platform_directory] = File.join(settings[:tools_directory], settings[:platform_id])
+        
+        mods[:release_root] = File.join(mods[:platform_directory], settings[:product_name])
 
-        mods[:path_to_revision] =  File.join( mods[:release_root] , settings[:product_revision] )
-
-        # mods[:path_to_revision] += "-#{settings[:os]}" unless settings[:agnostic] 
+        mods[:revision_directory] =  File.join( mods[:release_root] , settings[:product_revision] )
 
         mods
       end
@@ -36,8 +36,8 @@ module Flak::Template
 
       def destination_filepath(relative_path, file)
         bind = binding()
-        Flak::Errors.assert("@settings[:path_to_revision]", "String", bind,__FILE__)
-        File.join(@settings[:path_to_revision] , relative_path , file.pathmap('%f').no_erb)
+        Flak::Errors.assert("@settings[:revision_directory]", "String", bind,__FILE__)
+        File.join(@settings[:revision_directory] , relative_path , file.pathmap('%f').no_erb)
       end
 
 

data/lib/flak/rake/templates/mac.rb

@@ -11,9 +11,9 @@ module Flak::Template
 
       def mac_app_release_path(file)     
         bind = binding()
-        Flak::Errors.assert("@settings[:path_to_revision]", "String", bind,__FILE__)
+        Flak::Errors.assert("@settings[:revision_directory]", "String", bind,__FILE__)
         Flak::Errors.assert("@settings[:product_revision]", "String", bind,__FILE__)
-        File.join(@settings[:path_to_revision], 'bin', "#{file.pathmap('%f').pathmap('%X')}-#{@settings[:product_revision]}#{file.pathmap('%x')}")   
+        File.join(@settings[:revision_directory], 'bin', "#{file.pathmap('%f').pathmap('%X')}-#{@settings[:product_revision]}#{file.pathmap('%x')}")   
       end
 
     end

data/lib/flak/rake/templates/maya.rb

@@ -13,46 +13,15 @@ module Flak::Template
 
       def self.settings_modifications settings
 
-        maya_string =''
-        case settings[:os]
-        when /linux_64/ 
-          maya_string = "maya#{settings[:maya_version]}-x64"
-        when /darwin/
-          maya_string = "maya#{settings[:maya_version]}"
-        when /win_64/
-          maya_string = "Maya#{settings[:maya_version]}"
-        end
-
         mods = Hash.new
 
         bind = binding()
-        Flak::Errors.assert("settings[:autodesk_location]", "String", bind,__FILE__)
-        Flak::Errors.assert("settings[:path_to_revision]", "String", bind,__FILE__)
-        mods[:maya_location] =  File.join(   settings[:autodesk_location],maya_string )
-
-
-        mods[:maya_release_path] = File.join(  settings[:path_to_revision],"maya" )
+        Flak::Errors.assert("settings[:revision_directory]", "String", bind,__FILE__)
+        mods[:maya_release_path] = File.join(  settings[:revision_directory],"maya" )
 
         mods
       end
 
-      #  def maya_icon_destination(file)
-      #    File.join(@settings[:maya_release_path] ,'icons', file.pathmap('%f').no_erb)   
-      #  end
-      #
-      # def maya_script_destination(file)
-      #   File.join(@settings[:maya_release_path] , 'scripts', file.pathmap('%f').no_erb)
-      # end
-      #
-      #
-      # def maya_scripted_plugin_destination(file)
-      #   File.join(@settings[:maya_release_path] , 'plug-ins' , file.pathmap('%f').no_erb)
-      # end
-      #
-      # def maya_precompiled_plugin_destination(file)
-      #   File.join(@settings[:maya_release_path] , 'plug-ins' , file.pathmap('%f').no_erb)
-      # end
-
       def outliner_icon_build_filename(file)
         icon_build_filename("out_#{file}")
       end
@@ -67,7 +36,6 @@ module Flak::Template
         File.join(@settings[:build_directory],'icons', file.pathmap('%f').ext('xpm') ) 
       end
 
-
     end
 
 
@@ -89,15 +57,15 @@ module Flak::Template
 
           source_files.each do |f|
 
-            ['outliner','dg'].each do |t|
+            ['outliner','dg'].each do |type|
 
-              build_file = target.send "#{t}_icon_build_filename", f
+              build_file = target.send "#{type}_icon_build_filename", f
 
               dest_file = target.destination_filepath( settings[:maya_icon_destination], build_file)
 
               file build_file => f do |t|
                 target.make_directory_for(build_file)
-                cmd_key = "#{t}_icon_convert_cmd".to_sym
+                cmd_key = "#{type}_convert_cmd".to_sym
                 cmd = "#{settings[cmd_key]} #{f} #{build_file}"
                 sh cmd
               end

data/lib/flak/rake/templates/maya_app.rb

@@ -35,24 +35,17 @@ module Flak::Template
         mods[:lib_paths] = [ lib_path ]
 
         case settings[:os]
-        when /linux_64/ 
+        when /linux64/ 
           mods[:linker_options] =  [ "-Wl,-rpath,#{lib_path}" ]
-
-
           mods[:include_paths] = [  File.join( settings[:maya_location], "include" ) ]  
-        when /darwin/
+        when /darwin64/
           mods[:linker_options] =  [ "-Wl,-executable_path,#{lib_path}" ]
-
           mods[:include_paths] = [  File.join(settings[:maya_location],"devkit", "include" ) ]  
-        when /win_64/
+        when /win64/
           mods[:linker_options] = []
-
           mods[:include_paths] = [  File.join(settings[:maya_location], "include" ) ]  
         end
 
-
-
-
         mods[:compiler_options] =  [
           "-D\"PLUGIN_VERSION=\\\"#{settings[:product_revision]}\\\"\"",
           "-D\"PLUGIN_VENDOR=\\\"#{settings[:author_name].gsub(' ','')}\\\"\"",
@@ -70,7 +63,7 @@ module Flak::Template
       # and as such will have access to the @settings instance variable
       ###################################################
       def release_filename 
-        File.join( @settings[:path_to_revision], 'bin', build_filename.pathmap('%f'))   
+        File.join( @settings[:revision_directory], 'bin', build_filename.pathmap('%f'))   
       end
       ###################################################
 

data/lib/flak/rake/templates/maya_plugin.rb

@@ -27,16 +27,16 @@ module Flak::Template
         mods[:lib_paths] = [ lib_path ]
 
         case settings[:os]
-        when /linux_64/ 
+        when /linux64/ 
           mods[:linker_options] =  [ "-Wl,-rpath,#{lib_path}" ]
 
 
           mods[:include_paths] = [  File.join( settings[:maya_location], "include" ) ]  
-        when /darwin/
+        when /darwin64/
           mods[:linker_options] =  [ "-Wl,-executable_path,#{lib_path}" ]
 
           mods[:include_paths] = [  File.join(settings[:maya_location],"devkit", "include" ) ]  
-        when /win_64/
+        when /win64/
           mods[:linker_options] = []
 
           mods[:include_paths] = [  File.join(settings[:maya_location], "include" ) ]  
@@ -60,7 +60,7 @@ module Flak::Template
       # and as such will have access to the @settings instance variable
       ###################################################
       def release_filename 
-        File.join( @settings[:path_to_revision], 'maya', 'plug-ins', build_filename.pathmap('%f'))   
+        File.join( @settings[:revision_directory], 'maya', 'plug-ins', build_filename.pathmap('%f'))   
       end
       ###################################################
 

data/lib/flak/rake/templates/nuke.rb

@@ -16,25 +16,25 @@ module Flak::Template
 
         bind = binding()
         Flak::Errors.assert("settings[:os]", "String", bind,__FILE__)
-        Flak::Errors.assert("settings[:path_to_revision]", "String", bind,__FILE__)
+        Flak::Errors.assert("settings[:revision_directory]", "String", bind,__FILE__)
         Flak::Errors.assert("settings[:nuke_version]", "String", bind,__FILE__)
 
 
         mods = Hash.new
 
         case settings[:os]
-        when /linux_64/ 
+        when /linux64/ 
           mods[:nuke_location] = ""
-        when /darwin/
+        when /darwin64/
           mods[:nuke_location] = "/Applications/Nuke#{settings[:nuke_version]}-32/Nuke#{settings[:nuke_version]}.app/Contents"
-        when /win_64/
+        when /win64/
           mods[:nuke_location] = ""
         end
 
 
 
-        msg = 'Problem creating mods[:nuke_release_path] from: settings[:path_to_revision],"nuke"'
-        mods[:nuke_release_path] = File.join(settings[:path_to_revision],"nuke" ) 
+        msg = 'Problem creating mods[:nuke_release_path] from: settings[:revision_directory],"nuke"'
+        mods[:nuke_release_path] = File.join(settings[:revision_directory],"nuke" ) 
 
 
         mods

data/lib/flak/rake/templates/release.rb

@@ -19,9 +19,9 @@ module Flak::Template
       def release_script_destination(file)     
 
         bind = binding()
-        Flak::Errors.assert("@settings[:path_to_revision]", "String", bind,__FILE__)
+        Flak::Errors.assert("@settings[:revision_directory]", "String", bind,__FILE__)
 
-        File.join( @settings[:path_to_revision], 'bin', file.pathmap('%f').no_erb )   
+        File.join( @settings[:revision_directory], 'bin', file.pathmap('%f').no_erb )   
       end
 
 
@@ -30,9 +30,9 @@ module Flak::Template
         bind = binding()
         Flak::Errors.assert("@settings[:product_name]", "String", bind,__FILE__)
         Flak::Errors.assert("@settings[:product_revision]", "String", bind,__FILE__)
-        Flak::Errors.assert("@settings[:os]", "String", bind,__FILE__)
+        Flak::Errors.assert("@settings[:platform_id]", "String", bind,__FILE__)
         
-        "#{@settings[:product_name]}-#{@settings[:product_revision]}-#{@settings[:os]}.tar.gz"
+        "#{@settings[:product_name]}-#{@settings[:product_revision]}-#{@settings[:platform_id]}.tar.gz"
 
       end
 
@@ -40,7 +40,6 @@ module Flak::Template
         bind = binding()
         Flak::Errors.assert("@settings[:product_name]", "String", bind,__FILE__)
         Flak::Errors.assert("@settings[:product_revision]", "String", bind,__FILE__)
-        Flak::Errors.assert("@settings[:os]", "String", bind,__FILE__)
         n = "#{@settings[:product_name]}/#{@settings[:product_revision]}"
       end
 
@@ -63,7 +62,7 @@ module Flak::Template
         desc "Build everything"
         task :build 
         CLEAN.include( File.dirname(settings[:build_directory])  )
-        CLOBBER.include( settings[:path_to_revision]) 
+        CLOBBER.include( settings[:revision_directory]) 
 
         desc "Release everything"     
         task :default => ["release"]
@@ -73,7 +72,7 @@ module Flak::Template
 
         desc "Build and tar up product to tar.gz."     
         task :tar => :release do
-          Dir.chdir( settings[:tools_directory] ) do |d|
+          Dir.chdir( settings[:platform_directory] ) do |d|
             sh "tar cfz #{target.tar_filename} #{target.file_to_tar}"
           end
         end

data/lib/flak/rake/templates/shell.rb

@@ -18,9 +18,9 @@ module Flak::Template
 
       def shell_script_destination(file)     
         bind = binding()
-        Flak::Errors.assert("@settings[:path_to_revision]", "String", bind,__FILE__)
+        Flak::Errors.assert("@settings[:revision_directory]", "String", bind,__FILE__)
 
-        File.join(@settings[:path_to_revision], 'bin', file.pathmap('%f'))   
+        File.join(@settings[:revision_directory], 'bin', file.pathmap('%f'))   
       end
 
 

data/lib/flak/thor/generate.rb

@@ -49,16 +49,21 @@ module Flak
       opts = self.project_options
       self.name = name
       empty_directory("build") 
-      directory("doc")
       empty_directory("plugins")
       directory("config")
+      directory("doc")
       template( "LICENSE.tt", "LICENSE.txt")
       template( "README.tt", "README.txt")
-      template( "product.mel.tt" ,    "script/maya/erb/#{name}.mel.erb"            ) if opts[:maya_module]
-      template(  "INSTALL.tt"     ,   "script/shell/erb/INSTALL_#{name.upcase}.erb")
-      template(  "product.sh.tt"  ,   "script/shell/#{name}.sh"                    )
-      template(  "raia_package.tt"  ,"script/package/package.yml.erb"      )
-      copy_file(  "module.tt"  ,      "script/maya/modules/#{name}.erb"                )
+      template( "product.mel.tt" ,    "script/maya/erb/#{name}.mel.erb" ) if opts[:maya_module]
+      copy_file("module.tt"  ,      "resource/maya/module.erb" ) if opts[:maya_module]
+      
+      copy_file( "INSTALL.sh.tt",   "resource/config/INSTALL.sh")
+      template( "INSTALL.BAT.tt",   "resource/config/INSTALL.BAT")
+      template(  "env.sh.tt"  ,   "resource/config/env.sh"  )
+      
+      create_file "resource/raia/package.yml" do
+         Flak::TargetFile.raia_package(name,opts)
+      end
 
       create_file  "project.yml" do 
         Flak::TargetFile.project(name,opts)
@@ -136,6 +141,8 @@ module Flak
         empty_directory("#{name}/maya/script/plugin")
         empty_directory("#{name}/maya/icons/node") 
         template("init.mel.tt", "#{name}/maya/script/#{name}.init.mel")
+        copy_file(  "workspace.mel"  ,     "#{name}/examples/workspace.mel"               )
+
       end
 
       #desc "create_nuke_script_tree [name]", "Makes tool files needed for nuke development"
@@ -170,7 +177,28 @@ module Flak
 
     end
 
+    desc "raia", "Create a raia package file"
+    map "r" => :raia    
+    def raia
+      name=  File.basename(destination_root)
+      opts = {}
+      opts[:maya_module] = true
+      create_file 'resource/raia/package.yml' do
+         Flak::TargetFile.raia_package(name,opts)
+      end
+    end
 
+    #############
+    # Make Config Files individually
+    desc "templates", "Create config templates. Run this from an existing project directory"
+    map "m" => :templates    
+    def templates
+      self.name=   File.basename(destination_root)
+      directory("config")
+    end
+    
+    
+    #############
 
 
 

data/lib/flak/thor/target_file.rb

@@ -13,7 +13,7 @@
 
 module Flak
   module TargetFile
-    
+
 
     # Generate a tool.yml target file according to options given by the user, usually through a wizard.
     # @param name [String] name of the tool.    
@@ -70,20 +70,66 @@ module Flak
       h['name'] = "#{name.camelize}Project"
       h['templates'] = ["release", "doc"]
       
+
+
+      h['os_darwin64'] = {}
+      h['os_linux64'] = {}
+      h['os_win64'] = {}
+
+      h['os_darwin64']['release_script_copy_files'] =  ["resource/config/*.sh"] 
+      h['os_linux64']['release_script_copy_files'] =  ["resource/config/*.sh"] 
+      h['os_win64']['release_script_copy_files'] =  ["resource/config/*.BAT"] 
+
+
       if options[:maya_module]
         h['maya_script_copy_files'] = ["script/maya/*.mel","script/maya/*.py","script/maya/*.pyc"]
         h['maya_script_erb_files'] = ["script/maya/erb/*.mel.erb","script/maya/erb/*.py.erb"]
         h['templates'] << "maya"
-        h['maya_modules_erb_files'] = ["script/maya/modules/*.erb"] 
+        h['os_darwin64']['maya_modules_erb_files'] =  ["resource/config/*.sh"] 
+        h['os_linux64']['maya_modules_erb_files'] = ["resource/config/*.sh"] 
       end
       
-      h['release_script_copy_files'] = ["script/shell/*.sh"] 
-      h['release_script_erb_files'] = ["script/shell/erb/*.erb"] 
-      h['package_erb_files'] = ["script/package/*.erb"] 
       h['default_copy_files'] = ["LICENSE.*", "README.*"] 
+      h['package_erb_files'] = ["resource/raia/*"] 
+
 
       YAML::dump(h)
     end
 
+    def self.raia_package(name,options={})
+      h = Hash.new
+      h['name'] = name
+      h['description'] = "Description goes here"
+      h['version'] = "<%= settings[:product_revision] %>"
+      h['documentation'] = {"html" => "<%= settings[:revision_directory] %>/doc/index.html"}
+      h['platform'] =  {"id" => "<%= settings[:platform_id] %>"}
+      h['software_location'] =  "<%= settings[:revision_directory] %>"
+
+
+      h['requirements'] = []
+      if options[:maya_module]
+        h['requirements'] << {"name" => "maya", "version" => '==2012'}
+        h['requirements'] << {"name" => "jlib", "version" => '>=0.0.7'}
+      end
+
+      h['runtimes'] = []
+
+      h['env'] ={}
+
+      h['env']["#{name.upcase}_PROJECT_PATH"] = "$software_location"
+
+      h['env']["MAYA_MODULE_PATH"] = "$env.MAYA_MODULE_PATH:$software_location/modules"  if options[:maya_module]
+
+      h['env']["NUKE_PATH"] = "$env.NUKE_PATH:$software_location/nuke/scripts" if options[:nuke]
+
+      if options[:delight]
+        h['env']["DL_SHADERS_PATH"] = "$env.DL_SHADERS_PATH:$software_location/delight/shader" 
+        h['env']["DL_PROCEDURALS_PATH"] = "$env.DL_PROCEDURALS_PATH:$software_location/delight/procedural" 
+      end
+      
+      JSON.pretty_generate(h)
+
+    end
+
   end
 end

data/lib/flak/thor/templates/INSTALL.BAT.tt

@@ -0,0 +1,73 @@
+
+@ECHO OFF
+
+SET CONFIG_DIR=%~dp0
+
+CALL :RESOLVE "%CONFIG_DIR%\.." MODULE_LOCATION
+
+CALL :EXTRACT "%MODULE_LOCATION%" VERSION_STRING
+
+CALL :EXTRACT "%MODULE_LOCATION%\.." PROJECT_NAME
+
+echo ---------------------------------------------
+echo Setting up %PROJECT_NAME%
+echo ---------------------------------------------
+
+<% if project_options[:nuke] -%>
+echo --------------------NUKE_PATH---------
+echo If the same module
+echo appears more than once, you should remove duplicates
+echo or older versions from the environment using the 
+echo environment variable control panel.
+echo ---------------------------------------------
+IF "%NUKE_PATH%" == "" GOTO :NO_NUKE_PATH
+:YES_NUKE_PATH
+SET buff="%NUKE_PATH%;%MODULE_LOCATION%\nuke\scripts"
+GOTO :END_NUKE_PATH
+:NO_NUKE_PATH
+SET buff="%MODULE_LOCATION%\nuke\scripts"
+:END_NUKE_PATH
+setx NUKE_PATH %buff%
+setlocal EnableDelayedExpansion
+set LF=^
+
+
+echo %buff:;=!LF!%
+endlocal
+<% end -%>
+
+<% if project_options[:maya_module] -%>
+echo --------------------MAKING MODULE FILE---------
+set maya_module_dir=%USERPROFILE%\Documents\maya\modules
+mkdir %maya_module_dir%
+echo + %PROJECT_NAME% %VERSION_STRING% %MODULE_LOCATION%\maya > "%maya_module_dir%\%PROJECT_NAME%"
+echo Created  %maya_module_dir%\%PROJECT_NAME%
+echo ---------------------------------------------
+<% end -%>
+
+
+
+echo --------------------PATH---------------------
+echo I can't change the system path variable!!
+echo You will have to do it yourself, or ask ask
+echo a systems administrator. Go to the 
+echo start menu, right click on "Computer", 
+echo and go to "properties".
+echo Click "Advanced System Settings"
+echo Click "Environment Variables"
+echo Create or append to the "PATH" user variable with this directory:
+echo %MODULE_LOCATION%\bin
+echo Don't forget to remove old versions or 
+echo duplicates should you find some.
+
+GOTO :EOF
+
+:RESOLVE
+SET %2=%~f1
+GOTO :EOF
+
+
+:EXTRACT
+SET %2=%~nx1
+GOTO :EOF
+

data/lib/flak/thor/templates/INSTALL.sh.tt

@@ -0,0 +1,74 @@
+#!/bin/tcsh
+
+#TODO - rewrite in ruby
+
+# INSTALL script for bash
+# Write lines at the bottom of bashrc to source the env.sh file
+
+set rootdir = `dirname $0`
+set rootdir = `cd $rootdir && pwd`    # ensure absolute path
+set basedir = `basename $0`
+
+# set full_path_to_this_script = `echo $0 | sed "s@^./@$PWD/@"`
+set full_path_to_this_script = ${rootdir}/${basedir}
+echo "full path to script : ${full_path_to_this_script}"
+
+set tools = $full_path_to_this_script:h:h:h:h
+set product_version = $full_path_to_this_script:h:h:t
+set product =  $full_path_to_this_script:h:h:h:t
+set product_install_dir = ${tools}/${product}
+set product_up = `echo $product | tr '[a-z]' '[A-Z]'`
+
+echo "**************************************************************" 
+echo ""
+
+echo  "working from : ${tools}"
+pushd ${tools}
+
+echo ${product}" install directory is: ${product_install_dir}"
+
+set the_product_dir = ${product_install_dir}/${product_version}
+
+# add source .flak to .bashrc
+set bashrc = ${HOME}/.bashrc
+if ( ! -e ${bashrc} )  then
+	touch ${bashrc}
+endif
+
+set flaksrc = '# added by flak'
+set res = `grep  "${flaksrc}" ${HOME}/.bashrc`
+
+if ( "${res}" ==  ""  ) then	
+	echo "" >>   ${HOME}/.bashrc
+	echo '[[ -s "$HOME/.flak" ]] && . "$HOME/.flak" # added by flak' >>  ${HOME}/.bashrc
+endif
+
+# add source product env to .flak
+set flakenv = ${HOME}/.flak
+
+if (-f ${flakenv}) then
+	cp  ${flakenv}  ${flakenv}.${product}.bck
+	cat ${flakenv}.${product}.bck | grep -v "#.*added by ${product}" > ${flakenv}
+else
+	touch ${flakenv}
+endif
+
+
+echo "appending ${product} source commands to ${flakenv}"
+echo ""  >> ${flakenv}
+echo "# The following lines have been added by ${product}"  >> ${flakenv}
+echo 'export '${product_up}'_PROJECT_PATH="'${the_product_dir}'" # added by '${product} >> ${flakenv}
+echo '[[ -e "${'${product_up}'_PROJECT_PATH}/config/env.sh" ]] && . "${'${product_up}'_PROJECT_PATH}/config/env.sh" # added by '${product} >>  ${flakenv}
+
+echo ""
+echo "*********NOW RUN THESE COMMANDS OR (preferebly) OPEN A NEW SHELL***********" 
+echo ""
+echo "export ${product_up}_PROJECT_PATH=${the_product_dir}"
+echo '. ${'${product_up}'_PROJECT_PATH}/bin/env.sh'
+echo ""
+echo "**************************************************************" 
+
+
+popd
+
+

data/lib/flak/thor/templates/config/cpp.yml.tt

@@ -1,6 +1,6 @@
 os_linux64:
-    compiler:               '/opt/gcc412/bin/gcc412'
-    linker:                 '/opt/gcc412/bin/g++412'
+    compiler:               'gcc'
+    linker:                 'g++'
     archiver:               '/usr/bin/ar rv'
     target_extension: 		''
     dso_options:

data/lib/flak/thor/templates/config/environment.yml.tt

@@ -9,17 +9,19 @@ configuration:              "debug"
 product_name:               "<%= name %>"
 
 # The revision number for your product. You can set it to any string.
-product_revision:           "0.0.1"
+configuration_debug: 
+    product_revision:           "dev.999"
+configuration_release: 
+    product_revision:           "0.0.1"
 
 # Your full name is used for documentation and also to set plugin vendor 
 # information. This is done by adding these fields as compiler options
 # which are then picked up in the plugin code. In the case of a maya plugin
 # this happens in the initialize_plugin function.
-<% names =  `finger`.split("\n")[1].split(' ')[1..2] -%>
-author_name:                "<%=  names.collect {|p| p.capitalize}.join(' ') %>"
+author_name:                    "<%= ENV['USER'].capitalize %>"
 
 # Your email address is used for documentation.
-author_email:               "<%= names.join('.') %>@relianceada.com"
+author_email:               "<%= ENV['USER'] %>@relianceada.com"
 
 # Set the root of the release location here. Notice how specific locations 
 # are set for different platforms and named configurations.
@@ -33,17 +35,20 @@ author_email:               "<%= names.join('.') %>@relianceada.com"
 # rake -T | grep inspect 
 # and run one of the rake commands for a tool or the project.
 os_darwin64:   
+    platform_id: "darwin64"
     configuration_debug: 
-        tools_directory: "${HOME}/tools/darwin64"
+        tools_directory: "${HOME}/tools"
     configuration_release: 
-        tools_directory: "/software/package/darwin64"
+        tools_directory: "/software/package"
 os_linux64:   
+    platform_id: "linux64_centos5"
     configuration_debug: 
-        tools_directory: "${HOME}/tools/linux64"
+        tools_directory: "${HOME}/tools"
     configuration_release: 
-        tools_directory: "/software/package/linux64"
+        tools_directory: "/software/package"
 os_win64:
+    platform_id: "win64"
     configuration_debug: 
-        tools_directory: "/cygdrive/c/cygwin/${HOME}/tools/win64"
+        tools_directory: "/cygdrive/c/cygwin/${HOME}/tools"
     configuration_release: 
-        tools_directory: "/software/package/win64"
+        tools_directory: "/software/package"

data/lib/flak/thor/templates/config/maya.yml.tt

@@ -15,10 +15,11 @@ maya_scripted_plugin_destination:  'maya/plug-ins'
 maya_precompiled_plugin_destination:  'maya/plug-ins'
 
 os_linux64:
-    autodesk_location: '/usr/autodesk'
+    maya_location: '/software/package/linux64/maya/2012'
 
 os_darwin64:
-    autodesk_location: '/Applications/Autodesk'
+    maya_location: '/Applications/Autodesk/maya2012'
 
 os_win64:
-    autodesk_location: 'C:/Program Files/Autodesk'
+    maya_location: 'C:/Program Files/Autodesk/Maya2012'
+

data/lib/flak/thor/templates/config/release.yml.tt

@@ -1,4 +1,13 @@
-release_script_destination: 'bin'
+release_script_destination: 'config'
 package_destination: ''
-maya_modules_destination: 'modules'
 
+
+# maya_modules_destination is a path for the whole 
+# module and as such the maya template will not be mixed 
+# in to the project.yml file (perhaps it should be). 
+# Therefore it needs to be specified here.
+# In any case, this is currently a *nix thing - not win
+os_darwin64:   
+    maya_modules_destination: 'maya/modules'
+os_linux64:   
+    maya_modules_destination: 'maya/modules'

data/lib/flak/thor/templates/env.sh.tt

@@ -0,0 +1,37 @@
+<% path = "#{name.upcase}_PROJECT_PATH" -%>
+# append <%= path %> bin paths to PATH
+export PATH=$PATH:${<%= path %>}/bin
+
+<% if project_options[:delight] -%>
+# append <%= path %> delight paths to bin
+export PATH=$PATH:${<%= path %>}/delight/procedural
+
+# append <%= path %> delight resource paths
+
+if [[ -n $DL_SHADERS_PATH ]] ;
+	then export DL_SHADERS_PATH=${<%= path %>}/delight/shader:${DL_SHADERS_PATH} ;
+	else export DL_SHADERS_PATH=${<%= path %>}/delight/shader ;
+fi
+
+if [[ -n $DL_PROCEDURALS_PATH ]] ;
+	then export DL_PROCEDURALS_PATH=${<%= path %>}/delight/procedural:${DL_PROCEDURALS_PATH} ;
+	else export DL_PROCEDURALS_PATH=${<%= path %>}/delight/procedural ;
+fi
+<% end -%>
+
+<% if project_options[:nuke] -%>
+# append <%= path %> nuke resource paths
+if [[ -n $NUKE_PATH ]] ;
+	then export NUKE_PATH=${<%= path %>}/nuke/scripts:${NUKE_PATH} ;
+	else export NUKE_PATH=${<%= path %>}/nuke/scripts ;
+fi
+<% end -%>
+
+
+<% if project_options[:maya_module] -%>
+# append <%= path %> nuke resource paths
+if [[ -n $MAYA_MODULE_PATH ]] ;
+	then export MAYA_MODULE_PATH=${<%= path %>}/maya/modules:${MAYA_MODULE_PATH} ;
+	else export MAYA_MODULE_PATH=${<%= path %>}/maya/modules ;
+fi
+<% end -%>

data/lib/flak/thor/templates/gitignore.tt

@@ -1,8 +1,9 @@
 build
 doc/.sass*
 doc/output
+doc/tmp
 tmp/
 .DS_Store
 *.idb
 *.bak
-*~
+*~

data/lib/flak/thor/templates/module.tt

@@ -1,4 +1,4 @@
-+ <%= settings[:product_name]%> <%= settings[:product_revision]%> <%= settings[:path_to_revision]%>/maya
++ <%= settings[:product_name]%> <%= settings[:product_revision]%> <%= settings[:revision_directory]%>/maya
 
 
 

data/lib/flak/thor/templates/workspace.mel

@@ -0,0 +1,47 @@
+//Maya 2012 x64 Project Definition
+
+workspace -fr "offlineEdit" "scenes/edits";
+workspace -fr "translatorData" "data";
+workspace -fr "renderData" "renderData";
+workspace -fr "scene" "scenes";
+workspace -fr "DXF_DC" "data";
+workspace -fr "3dPaintTextures" "sourceimages/3dPaintTextures";
+workspace -fr "eps" "data";
+workspace -fr "mentalRay" "renderData/mentalray";
+workspace -fr "OBJexport" "data";
+workspace -fr "mel" "scripts";
+workspace -fr "furShadowMap" "renderData/fur/furShadowMap";
+workspace -fr "particles" "particles";
+workspace -fr "audio" "sound";
+workspace -fr "scripts" "scripts";
+workspace -fr "STEP_DC" "data";
+workspace -fr "sound" "sound";
+workspace -fr "studioImport" "data";
+workspace -fr "furFiles" "renderData/fur/furFiles";
+workspace -fr "depth" "renderData/depth";
+workspace -fr "autoSave" "autosave";
+workspace -fr "furAttrMap" "renderData/fur/furAttrMap";
+workspace -fr "diskCache" "cache";
+workspace -fr "FBX export" "data";
+workspace -fr "sourceImages" "sourceimages";
+workspace -fr "FBX" "data";
+workspace -fr "DAE_FBX export" "data";
+workspace -fr "movie" "movies";
+workspace -fr "DAE_FBX" "data";
+workspace -fr "iprImages" "renderData/iprImages";
+workspace -fr "mayaAscii" "scenes";
+workspace -fr "furImages" "renderData/fur/furImages";
+workspace -fr "IGES_DC" "data";
+workspace -fr "furEqualMap" "renderData/fur/furEqualMap";
+workspace -fr "illustrator" "data";
+workspace -fr "mayaBinary" "scenes";
+workspace -fr "move" "data";
+workspace -fr "images" "images";
+workspace -fr "fluidCache" "cache/fluid";
+workspace -fr "SPF_DC" "data";
+workspace -fr "clips" "clips";
+workspace -fr "OBJ" "data";
+workspace -fr "templates" "assets";
+workspace -fr "STL_DC" "data";
+workspace -fr "shaders" "renderData/shaders";
+workspace -fr "DWG_DC" "data";

data/lib/flak/version.rb

@@ -1,3 +1,3 @@
 module Flak
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flak
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70253149612240 !ruby/object:Gem::Requirement
+  requirement: &70320783082380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253149612240
+  version_requirements: *70320783082380
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70253149608760 !ruby/object:Gem::Requirement
+  requirement: &70320783078480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253149608760
+  version_requirements: *70320783078480
 - !ruby/object:Gem::Dependency
   name: nanoc
-  requirement: &70253149608240 !ruby/object:Gem::Requirement
+  requirement: &70320783078040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253149608240
+  version_requirements: *70320783078040
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70253149607740 !ruby/object:Gem::Requirement
+  requirement: &70320783077580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253149607740
+  version_requirements: *70320783077580
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70253149607220 !ruby/object:Gem::Requirement
+  requirement: &70320783077040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253149607220
+  version_requirements: *70320783077040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70253149606660 !ruby/object:Gem::Requirement
+  requirement: &70320783076520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70253149606660
+  version_requirements: *70320783076520
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70253149606140 !ruby/object:Gem::Requirement
+  requirement: &70320783076100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253149606140
+  version_requirements: *70320783076100
 description: VFX tool build and documentation framework based on rake with thor generators
 email:
 - julian.mann@gmail.com
@@ -136,7 +136,8 @@ files:
 - lib/flak/thor/generate.rb
 - lib/flak/thor/junk/junk.rb
 - lib/flak/thor/target_file.rb
-- lib/flak/thor/templates/INSTALL.tt
+- lib/flak/thor/templates/INSTALL.BAT.tt
+- lib/flak/thor/templates/INSTALL.sh.tt
 - lib/flak/thor/templates/LICENSE.tt
 - lib/flak/thor/templates/README.tt
 - lib/flak/thor/templates/Rakefile.tt
@@ -189,6 +190,7 @@ files:
 - lib/flak/thor/templates/doc/lib/helpers.rb
 - lib/flak/thor/templates/doc/scenes/.empty_directory
 - lib/flak/thor/templates/doc/scenes/module_logo.psd
+- lib/flak/thor/templates/env.sh.tt
 - lib/flak/thor/templates/gitignore.tt
 - lib/flak/thor/templates/init.mel.tt
 - lib/flak/thor/templates/maya_plugin_cpp.tt
@@ -198,8 +200,7 @@ files:
 - lib/flak/thor/templates/plugin.rb.tt
 - lib/flak/thor/templates/plugin.yml.tt
 - lib/flak/thor/templates/product.mel.tt
-- lib/flak/thor/templates/product.sh.tt
-- lib/flak/thor/templates/raia_package.tt
+- lib/flak/thor/templates/workspace.mel
 - lib/flak/thor/wizard.rb
 - lib/flak/version.rb
 - target.graffle

data/lib/flak/thor/templates/INSTALL.tt

@@ -1,118 +0,0 @@
-#!/bin/tcsh
-
-#TODO - rewrite in ruby
-
-
-# INSTALL script for mac and linux - the purpose of this script is to:
-# Write lines at the bottom of bashrc to source the <%%=  @settings[:product_name] %>.sh file
-# Write the Maya modules file if this is a module, and put it in the maya app dir modules directory
-
-set maya_ver =  "<%%=  @settings[:maya_version] %>"
-
-set product_up = "<%%= @settings[:product_name].upcase %>"
-set product_version =  "<%%= self.settings[:product_revision] %>"
-set product = "<%%=  @settings[:product_name] %>"
-
-set rootdir = `dirname $0`
-set rootdir = `cd $rootdir && pwd`    # ensure absolute path
-set base = `basename $0`
-
-# set full_path_to_this_script = `echo $0 | sed "s@^./@$PWD/@"`
-set full_path_to_this_script = ${rootdir}/${base}
-echo "full path to script : ${full_path_to_this_script}"
-
-set tools = $full_path_to_this_script:h:h:h:h
-set version_dir = $full_path_to_this_script:h:h:t
-
-set product_install_dir = ${tools}/<%%= @settings[:product_name] %>
-echo "**************************************************************" 
-echo ""
-
-echo  "working from : ${tools}"
-pushd ${tools}
-
-echo "<%%= @settings[:product_name] %> install directory is: ${product_install_dir}"
-
-set install_platform = ""
-set maya_ver_dir =""
-set modules_dir = ""
-set maya_app_dir =""
-
-if (! $?MAYA_APP_DIR)  then
-	setenv MAYA_APP_DIR	"${HOME}/maya"
-endif
-
-set maya_app_dir = ${MAYA_APP_DIR}
-
-set os=`uname -s`
-echo "os is: ${os}"
-
-
-if ($os == "Linux") then
-	set arch=`uname -m`
-	if (maya_app_dir == "") then
-		set maya_app_dir = "${HOME}/maya"
-	endif	
-	if ($arch == "x86_64") then
-		set install_platform = "linux_64"
-		set maya_ver_dir = "${maya_ver}-x64"
-	else
-		set install_platform = "linux_32"
-		set maya_ver_dir = "${maya_ver}"
-	endif
-endif
-
-if ($os == "Darwin") then
-	if (maya_app_dir == "") then
-		set maya_app_dir = "${HOME}/Library/Preferences/Autodesk/maya"
-	endif
-	set install_platform = "darwin"
-	set maya_ver_dir = "${maya_ver}-x64"
-endif
-
-if ($os == "CYGWIN_NT-6.1-WOW64") then
-	if (maya_app_dir == "") then
-		set maya_app_dir = "${HOME}/maya"
-	endif
-	set install_platform = "cygwin"
-	set maya_ver_dir = "${maya_ver}-x64"
-endif
-
-set modules_dir = "${maya_app_dir}/${maya_ver_dir}/modules"
-mkdir -p $modules_dir
-
-set the_product_dir = ${product_install_dir}/${version_dir}
-set the_maya_module = ${the_product_dir}"/maya"
-
-<% if project_options[:maya_module] -%>
-echo "+ <%%= @settings[:product_name] %> <%%= self.settings[:product_revision] %> ${the_maya_module}" > ${modules_dir}/<%%= @settings[:product_name] %>
-echo "writing + <%%= @settings[:product_name] %> <%%= self.settings[:product_revision] %> ${the_maya_module} to ${modules_dir}/<%%= @settings[:product_name] %>"
-<% else -%>
-# Uncomment the next 2 lines if you want this script to set up the <%%= @settings[:product_name] %> maya module file
-# echo "+ <%%= @settings[:product_name] %> <%%= self.settings[:product_revision] %> ${the_maya_module}" > ${modules_dir}/<%%= @settings[:product_name] %>
-# echo "writing + <%%= @settings[:product_name] %> <%%= self.settings[:product_revision] %> ${the_maya_module} to ${modules_dir}/<%%= @settings[:product_name] %>"
-<% end -%>
-
-if (-f ${HOME}/.bashrc) then
-	cp  ${HOME}/.bashrc  ${HOME}/.bashrc.<%%= @settings[:product_name] %>.bck
-	cat ${HOME}/.bashrc.<%%= @settings[:product_name] %>.bck | grep -v "#.*added by <%%= @settings[:product_name] %>" > ${HOME}/.bashrc
-
-	echo "appending <%%= @settings[:product_name] %> source commands to  ${HOME}/.bashrc"
-	
-	echo "# The following lines have been added by <%%= @settings[:product_name] %>"  >> ${HOME}/.bashrc
-	echo 'export <%%= @settings[:product_name].upcase %>_PROJECT_PATH="'${the_product_dir}'" # added by <%%= @settings[:product_name] %>' >> ${HOME}/.bashrc
-	echo '[[ -e "${<%%= @settings[:product_name].upcase %>_PROJECT_PATH}/bin/<%%= @settings[:product_name] %>.sh" ]] && . "${<%%= @settings[:product_name].upcase %>_PROJECT_PATH}/bin/<%%= @settings[:product_name] %>.sh" # added by <%%= @settings[:product_name] %>' >> ${HOME}/.bashrc
-
-	echo ""
-	echo "*********NOW RUN THESE COMMANDS OR OPEN A NEW SHELL***********" 
-	echo ""
-	echo "export <%%= @settings[:product_name].upcase %>_PROJECT_PATH=${the_product_dir}"
-	echo '. ${<%%= @settings[:product_name].upcase %>_PROJECT_PATH}/bin/<%%= @settings[:product_name] %>.sh'
-	echo ""
-	echo "**************************************************************" 
-
-endif
-
-popd
-
-

data/lib/flak/thor/templates/product.sh.tt

@@ -1,31 +0,0 @@
-<% path = "#{name.upcase}_PROJECT_PATH" -%>
-# append <%= path %> bin paths to PATH
-export PATH=$PATH:${<%= path %>}/bin
-
-<% if project_options[:delight] -%>
-# append <%= path %> delight paths to bin
-export PATH=$PATH:${<%= path %>}/delight/procedural
-
-# append <%= path %> delight resource paths
-
-if [[ -n $DL_SHADERS_PATH ]] ;
-	then export DL_SHADERS_PATH=.:${<%= path %>}/delight/shader:${DL_SHADERS_PATH} ;
-	else export DL_SHADERS_PATH=.:${<%= path %>}/delight/shader ;
-fi
-
-if [[ -n $DL_PROCEDURALS_PATH ]] ;
-	then export DL_PROCEDURALS_PATH=.:${<%= path %>}/delight/procedural:${DL_PROCEDURALS_PATH} ;
-	else export DL_PROCEDURALS_PATH=.:${<%= path %>}/delight/procedural ;
-fi
-	
-
-<% end -%>
-
-<% if project_options[:nuke] -%>
-# append <%= path %> nuke resource paths
-
-if [[ -n $NUKE_PATH ]] ;
-	then export NUKE_PATH=.:${<%= path %>}/nuke/scripts:${NUKE_PATH} ;
-	else export NUKE_PATH=.:${<%= path %>}/nuke/scripts ;
-fi
-<% end -%>

data/lib/flak/thor/templates/raia_package.tt

@@ -1,24 +0,0 @@
-{
-    'name': '<%%=settings[:product_name]%>',
-    'description': 'Description goes here.',
-    'version': '<%%=settings[:product_revision]%>',
-    'platform': {'id': '<%%= settings[:os] %>'},
-    'software_location': '<%%=settings[:path_to_revision]%>',
-    'documentation': {  'html': '<%%=settings[:doc_destination]%>/index.html' },
-    'requirements':  [  
-<% if project_options[:maya_module] -%>
-    {'name': 'maya', 'version': '>=2011'}  ,
-    {'name': 'jlib', 'version': '>=0.0.3'}  
-<% end -%>
-    ],
-    'runtimes': [],
-    'env': { 
-        '<%%=settings[:product_name].upcase %>_PROJECT_PATH': '<%%=settings[:path_to_revision]%>' 
-<% if project_options[:maya_module] -%>
-        ,'MAYA_MODULE_PATH': '$env.MAYA_MODULE_PATH:<%%=settings[:path_to_revision]%>/modules' 
-<% end -%>
-<% if project_options[:nuke] -%>
-        ,'NUKE_PATH': '$env.NUKE_PATH:<%=settings[:path_to_revision]%>/nuke/scripts'  
-<% end -%>
-    }
-}