ryb 0.0.0.dev → 0.1.0

data/lib/ryb/windows.rb

@@ -0,0 +1,40 @@
+module Ryb
+  module Windows
+    POSSIBLE_SDK_INSTALL_DIRECTORY_REGISTRY_KEYS =
+      ["SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows",
+       "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows"]
+
+    def self.sdk
+      if Ryb.platform == :windows
+        if ENV.key?('WindowsSdkDir')
+          ENV['WindowsSdkDir']
+        else
+          # TODO(mtwilliams): Escape, i.e. .gsub(/\\/,'/').gsub(/\ /,'\\ ')?
+          self.sdks.first
+        end
+      end
+    end
+
+    def self.sdk?
+      !self.sdk.nil?
+    end
+
+    def self.sdks
+      if Ryb.platform == :windows
+        require 'win32/registry'
+        @sdks ||= begin
+          (POSSIBLE_SDK_INSTALL_DIRECTORY_REGISTRY_KEYS.map do |key|
+            begin
+              ::Win32::Registry::HKEY_CURRENT_USER.open(key, ::Win32::Registry::KEY_READ)['CurrentInstallFolder']
+            rescue
+              begin
+                ::Win32::Registry::HKEY_LOCAL_MACHINE.open(key, ::Win32::Registry::KEY_READ)['CurrentInstallFolder']
+              rescue
+              end
+            end
+          end).compact
+        end
+      end
+    end
+  end
+end

data/lib/ryb/xcode.rb

@@ -0,0 +1,145 @@
+require 'ryb/project'
+
+module Ryb
+  module XCode
+    module Project
+    end
+
+    module Target
+      def self.setup_for_version(xc_project, xc_target, version)
+        xc_target.build_configuration_list.set_setting('SDKROOT', "macosx#{version}")
+      end
+
+      def self.add_file_references(xc_project, xc_target, files)
+        sources = xc_project.main_group['Source'] || xc_project.main_group.new_group('Source')
+        files.each do |file|
+          *dirs, file = Pathname(file).each_filename.to_a
+          group = dirs.reduce(sources) {|group, dir| group[dir] || group.new_group(dir, dir)}
+          ref = group.new_file(file)
+          xc_target.add_file_references([ref])
+        end
+      end
+    end
+
+    def self.generate_project_files_for(project, opts={})
+      # TODO(mtwilliams): Take into account opts[:root].
+      xc_proj = Xcodeproj::Project.new("#{project.name}.xcodeproj")
+      puts "Generating #{xc_proj.path}..."
+
+      xc_products_group = xc_proj.main_group['Products']
+      xc_products_group_for_libs = xc_products_group.new_group('lib', 'lib')
+      xc_products_group_for_bins = xc_products_group.new_group('bin', 'bin')
+
+      project.configurations.each do |name, config|
+        xc_build_configuration = xc_proj.build_configuration_list[config.name]
+        xc_build_configuration ||= xc_proj.build_configuration_list[config.name.capitalize]
+        xc_build_configuration ||= xc_proj.add_build_configuration(config.name, :release)
+        xc_build_configuration.name = (config.name.pretty || config.name.capitalize)
+        defines = project.defines.merge(config.defines)
+        xc_build_configuration.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = defines.map {|name, value| "#{name}=#{value}"}
+      end
+
+      xc_proj.build_configuration_list.set_setting('SYMROOT', opts[:built])
+      xc_proj.build_configuration_list.set_setting('CONFIGURATION_BUILD_DIR', opts[:built])
+      xc_proj.build_configuration_list.sort
+
+      (project.libraries + project.applications).each do |target|
+        puts " Adding '#{target.name.pretty || target.name}' as target..."
+        type = :application if target.is_a? Ryb::Application
+        type = {:static => :static_library, :dynamic => :dynamic_library}[target.linkage] if target.is_a? Ryb::Library
+        name = target.name
+        platform = :osx
+        deployment_target = (target.targets[:macosx].version.to_s if (target.targets[:macosx] and target.targets[:macosx].verison))
+        xc_target = xc_proj.new_target(type, name, platform, deployment_target)
+
+        # case type
+        # when :application
+        #   xc_target.product_reference.move(xc_products_group_for_bins)
+        # when :static_library
+        #   xc_target.product_reference.move(xc_products_group_for_libs)
+        # when :dynamic_library
+        #   xc_target.product_reference.move(xc_products_group_for_bins)
+        # end
+        # xc_target.product_reference.set_source_tree(:group)
+
+        # if target.name.pretty
+        #   xc_target.name = target.name.pretty
+        #   xc_target.product_name = target.name
+        # end
+
+        if target.targets[:macosx] and target.targets[:macosx].verison
+          Target.setup_for_version(xc_proj, xc_target, target.targets[:macosx].version)
+        end
+
+        # TODO(mtwilliams): Refactor.
+        configs = ((project.configurations.keys | target.configurations.keys).map do |config|
+          project_config = project.configurations[config]
+           if project_config
+             project_config = project_config.dup
+             project_config.instance_variable_set(:@defines, project.defines.merge(project_config.defines))
+           end
+          target_config = target.configurations[config]
+           if target_config
+             target_config = target_config.dup
+             target_config.instance_variable_set(:@defines, target.defines.merge(target_config.defines))
+           end
+          config = if project_config and target_config
+                     project_config.instance_variable_set(:@defines, project_config.defines.merge(target_config.defines))
+                     project_config
+                   else
+                     project_config || target_config
+                   end
+
+          [config.name, config]
+        end).to_h
+
+        configs.each do |name, config|
+          xc_build_configuration = xc_target.build_configuration_list[config.name]
+          xc_build_configuration ||= xc_target.build_configuration_list[config.name.capitalize]
+          xc_build_configuration ||= xc_target.add_build_configuration(config.name, :release)
+          xc_build_configuration.name = (config.name.pretty || config.name.capitalize)
+          xc_build_configuration.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = config.defines.map {|name, value| "#{name}=#{value}"}
+        end
+
+        expand_path_variables = lambda { |path|
+          path.gsub(/\:built/, opts[:built])
+        }
+
+        includes = target.paths[:includes].map(&expand_path_variables).map(&File.method(:expand_path))
+        xc_target.build_configuration_list.set_setting('USER_HEADER_SEARCH_PATHS', includes)
+        libraries = target.paths[:libraries].map(&expand_path_variables).map(&File.method(:expand_path))
+        libraries.each(&FileUtils.method(:mkdir_p))
+        xc_target.build_configuration_list.set_setting('LIBRARY_SEARCH_PATHS', libraries)
+        binaries = target.paths[:binaries].map(&expand_path_variables).map(&File.method(:expand_path))
+        binaries.each(&FileUtils.method(:mkdir_p))
+        # ???
+
+        xc_target.build_configuration_list.sort
+
+        xc_target.build_configuration_list.set_setting('BUILT_PRODUCTS_DIR', opts[:built])
+        case type
+        when :application
+          xc_target.build_configuration_list.set_setting('CONFIGURATION_BUILD_DIR', File.join(opts[:built], 'bin'))
+        when :static_library
+          xc_target.build_configuration_list.set_setting('CONFIGURATION_BUILD_DIR', File.join(opts[:built], 'lib'))
+        when :dynamic_library
+          xc_target.build_configuration_list.set_setting('CONFIGURATION_BUILD_DIR', File.join(opts[:built], 'bin'))
+        end
+
+        Target.add_file_references(xc_proj, xc_target, target.files[:source])
+
+        target.dependencies.each do |dependency|
+          xc_target_for_dep = [*(xc_proj.targets.objects.select {|target| target.product_name == dependency})].first
+          if xc_target_for_dep
+            xc_target.add_dependency(xc_target_for_dep)
+            xc_target
+          else
+            raise "Not implemented, yet!"
+          end
+        end
+      end
+
+      xc_proj.save
+    end
+  end
+end

data/lib/rybfile.rb

@@ -0,0 +1,15 @@
+require 'ryb'
+require 'ostruct'
+
+# TODO(mtwilliams): Improve the handling of Rybfiles.
+module Rybfile
+  def self.load(path)
+    begin
+      return OpenStruct.new(:project => eval(File.read(path), binding(), path)).freeze
+    rescue SignalException, SystemExit
+      raise
+    rescue SyntaxError, Exception => e
+      raise "Invalid Rybfile!\n #{path}\n #{e}"
+    end
+  end
+end

data/ryb.gemspec

@@ -20,5 +20,12 @@ Gem::Specification.new do |s|
   # TODO(mtwilliams): Handle this gracefuly in `bin/ryb'.
   s.require_paths = %w(lib)
 
+  s.add_dependency 'facets'
   s.add_dependency 'gli'
+  s.add_dependency 'xcodeproj'
+  s.add_dependency 'ninja-gen'
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'aruba'
 end

data/ryb.sublime-project

@@ -0,0 +1,19 @@
+{
+        "folders":
+        [
+                {
+                        "path": ".",
+
+                        "file_exclude_patterns": [
+                                "*.sublime-project",
+                                "*.sublime-workspace",
+                                "Gemfile.lock",
+                                "*.gem"
+                        ],
+
+                        "folder_exclude_patterns": [
+                                ".bundle"
+                        ]
+                }
+        ]
+}

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ryb
 version: !ruby/object:Gem::Version
-  version: 0.0.0.dev
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ninja-gen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ryb is a clean and extensible Ruby DSL for generating project files.
 email: m.t.williams@live.com
 executables:
@@ -31,16 +115,44 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - bin/ryb
 - lib/ryb.rb
-- lib/ryb/dsl.rb
-- lib/ryb/toolsets.rb
+- lib/ryb/application.rb
+- lib/ryb/architecture.rb
+- lib/ryb/architectures/x86.rb
+- lib/ryb/architectures/x86_64.rb
+- lib/ryb/configuration.rb
+- lib/ryb/library.rb
+- lib/ryb/name.rb
+- lib/ryb/ninja.rb
+- lib/ryb/project.rb
+- lib/ryb/properties.rb
+- lib/ryb/properties/architectures.rb
+- lib/ryb/properties/configurations.rb
+- lib/ryb/properties/defines.rb
+- lib/ryb/properties/dependencies.rb
+- lib/ryb/properties/files.rb
+- lib/ryb/properties/flags.rb
+- lib/ryb/properties/named.rb
+- lib/ryb/properties/paths.rb
+- lib/ryb/properties/suffix.rb
+- lib/ryb/properties/targets.rb
+- lib/ryb/target.rb
+- lib/ryb/targets/linux.rb
+- lib/ryb/targets/macosx.rb
+- lib/ryb/targets/windows.rb
 - lib/ryb/version.rb
+- lib/ryb/visual_studio.rb
+- lib/ryb/windows.rb
+- lib/ryb/xcode.rb
+- lib/rybfile.rb
 - ryb.gemspec
+- ryb.sublime-project
 homepage: https://RubifyYourBuild.com/
 licenses:
 - Public Domain
@@ -56,14 +168,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rubify Your Build!
 test_files: []
-has_rdoc: 

data/lib/ryb/dsl.rb

@@ -1,19 +0,0 @@
-module Ryb
-  module DSL
-    # TODO(mtwilliams): Refactor into Ryb::Runner? Ryb::Builder?
-    @_on_project_callbacks = []
-    def on_project(&block); @_on_project_callbacks << block; end
-
-    def project(name=nil, opts={}, &block)
-      # TODO(mtwilliams): Freak out if a name is not specified.
-      # TODO(mtwilliams): Freak out if `opts` is malformed, i.e. an unknown
-      # option is specified or a specified option is invalid.
-      project = Docile.dsl_eval(Ryb::Project::Builder.new, &block).build
-
-      # TODO(mtwilliams): Handle exceptions.
-      @_on_project_callbacks.each {|callback| callback(project)}
-
-      return project
-    end
-  end
-end

data/lib/ryb/toolsets.rb

@@ -1,17 +0,0 @@
-module Ryb
-  module Toolsets
-    AVAILABLE = %w{gmake vs2008 vs2010 vs2012 vs2013 vs2015}
-    def self.available?(toolset)
-      AVAILABLE.include?(toolset)
-    end
-  end
-
-  def self.generate_project_files(toolset, projects)
-    # ({:gmake  => Ryb::GMake.generate_project_files,
-    #   :vs2008 => Ryb::VS2008.generate_project_files,
-    #   :vs2010 => Ryb::VS2010.generate_project_files,
-    #   :vs2012 => Ryb::VS2012.generate_project_files,
-    #   :vs2013 => Ryb::VS2013.generate_project_files,
-    #   :vs2015 => Ryb::VS2015.generate_project_files}[toolset](projects))
-  end
-end