rake-delphi 0.0.9 → 0.0.11

data/lib/rake/delphi/dcc32tool.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+require 'rake/common/logger'
+require 'rake/delphi/tool'
+
+module Rake
+  module Delphi
+    class Dcc32Tool < CustomDelphiTool
+        attr_reader :env
+
+        def self.toolName
+            'bin/dcc32.exe'
+        end
+
+        def delphidir
+            @@delphidir
+        end
+
+        def delphilib
+            ENV['BDSLIB']
+        end
+
+        def init_env
+            @env ||= EnvVariables.new(self.class.rootForVersion(self.version) + '\Environment Variables', self.delphidir)
+        end
+
+        def readLibraryPaths(platform, platform_stripped)
+            Logger.trace(Logger::TRACE, 'Reading library paths for platform: ' + platform.to_s)
+            warn "WARNING! You are using Delphi XE or above but no platform defined!" if ENV['DELPHI_VERSION'].to_i >= 14 && ! platform
+
+            platform = platform.to_s != '' ? '\\' + platform : ''
+            # platform not used for old Delphis 'SearchPath'
+            libpaths = self.class.readUserOption('Library' + platform, 'Search Path', self.version).split(';') \
+                | self.class.readUserOption('Library', 'SearchPath', self.version).split(';')
+            Logger.trace(Logger::TRACE, 'Library paths read:')
+            Logger.trace(Logger::TRACE, libpaths)
+            dev = init_env
+            dev['PLATFORM'] = platform_stripped if platform_stripped
+            libpaths.map! do |lp|
+                unless lp.to_s.empty?
+                    lp = dev.expand(lp)
+                end
+                lp
+            end
+            Logger.trace(Logger::TRACE, 'Library paths expanded:')
+            Logger.trace(Logger::TRACE, libpaths)
+            return libpaths
+        end
+    end
+  end
+end

data/lib/rake/delphi/dccaarmtool.rb

@@ -0,0 +1,29 @@
+# vim: set shiftwidth=2 tabstop=2 expandtab:
+# encoding: utf-8
+
+require 'rake/delphi/dcc32tool'
+
+module Rake
+  module Delphi
+    class DccARMTool < Dcc32Tool
+      def self.toolName
+        'bin/dccaarm.exe'
+      end
+
+      def options
+        opts = []
+        linker_path = ENV['DELPHI_ANDROID_SDK_LINKER']
+        warn "Please, define DELPHI_ANDROID_SDK_LINKER environment variable.\n Otherwise you may get 'File not found: ldandroid.exe' error" unless linker_path
+        lib_path = ENV['DELPHI_ANDROID_SDK_LIBPATH']
+        warn 'Please, define DELPHI_ANDROID_SDK_LIBPATH environment variable' unless lib_path
+        linker_option = ENV['DELPHI_ANDROID_SDK_LINKER_OPTION']
+        warn 'Please, define DELPHI_ANDROID_SDK_LINKER_OPTION environment variable' unless linker_option
+        opts << '-TX.so'
+        opts << "--linker:\"#{linker_path}\""
+        opts << "--libpath:\"#{lib_path}\""
+        opts << "--linker-option:\"#{linker_option}\""
+        return opts
+      end
+    end
+  end
+end

data/lib/rake/delphi/envvariables.rb

@@ -8,6 +8,22 @@ module Rake
             ENV['DELPHI_VERSION']
         end
 
+        def initialize(regpath, delphidir)
+            readreg(regpath)
+            _dir = delphidir.gsub(/\/$/, '')
+            add('DELPHI', _dir)
+            add('BDS', _dir)
+            add('BDSLIB', _dir + '/Lib')
+            expand_vars
+            Logger.trace(Logger::TRACE, self)
+        end
+
+        def expand(value)
+            value = expand_value(value, self)
+            value = expand_value(value, ENV)
+        end
+
+    private
         def readreg(regpath)
             return unless regpath
             begin
@@ -29,34 +45,15 @@ module Rake
             end
         end
 
-        def initialize(regpath, delphidir)
-            readreg(regpath)
-            _dir = delphidir.gsub(/\/$/, '')
-            add('DELPHI', _dir)
-            add('BDS', _dir)
-            add('BDSLIB', _dir + '/Lib')
-            expand_vars
-            Logger.trace(Logger::TRACE, self)
-        end
-
         def add(var, value)
             self[var] = value
         end
 
-        def expand_global(value)
-            value.gsub!(/\$\((?'env_name'\w+)\)/) do |match|
+        def expand_value(value, values)
+            value.gsub(/\$\((?'env_name'\w+)\)/) do |match|
                 name = Regexp.last_match[:env_name].upcase
-                ENV[name] || match
-            end
-            value
-        end
-
-        def expand(value)
-            self.each do |name, val|
-                value.gsub!("$(#{name})", val)
-                value = expand_global(value)
+                values[name] || match
             end
-            value
         end
 
         def expand_vars

data/lib/rake/delphi/paclient.rb

@@ -0,0 +1,251 @@
+# vim: set shiftwidth=2 tabstop=2 expandtab:
+# encoding: utf-8
+
+require 'fileutils'
+require 'tempfile'
+require 'rake'
+require 'rake/helpers/rake'
+require 'rake/helpers/raketask'
+require 'rake/helpers/string'
+require 'rake/common/chdirtask'
+require 'rake/delphi/paclienttool'
+require 'rake/delphi/androidmanifest'
+
+module Rake
+  module Delphi
+    class PAClientTask < Rake::Task
+    public
+      attr_reader :dccTask
+      attr_accessor :suffix
+      attr_reader :deploymentfiles
+      attr_accessor :noclean # for debugging
+
+      def initialize(name, application)
+        super
+        @last_put_arg_index = 0
+        @suffix = 'AndroidPackage'
+        @manifest = application.define_task(AndroidManifestTask, shortname + ':manifest')
+        enhance([@manifest])
+        self.needed = false
+        dccTaskName = name.gsub(/:post$/, '')
+        @dccTask = application[dccTaskName]
+        @deploymentfiles = nil
+      end
+
+      def needed=(value)
+        super
+        @manifest.needed = value
+      end
+
+    private
+      def expand_vars(deploymentfiles)
+        @dccTask.dccTool.init_env
+        deploymentfiles.collect! do |value|
+          file, dfile = [value.keys.first, value.values.first]
+          if file.kind_of?(String)
+            file = @dccTask.dccTool.env.expand(file)
+          end
+          # return expanded path
+          { file => dfile }
+        end
+        return deploymentfiles
+      end
+
+      def put_args
+        @deploymentfiles ||= @dccTask.createVersionInfo.deploymentfiles('Android')
+        r = expand_vars(@deploymentfiles)
+        @manifest_hash ||= { :manifest => ['.\\', '1'] }
+        # add unless already added before
+        r << @manifest_hash unless r.include?(@manifest_hash)
+        return r
+      end
+
+      def steps
+        r = [:Clean]
+        # add appropriate 'put' commands count
+        put_args.each do |arg|
+          r << :put
+        end
+        r << [:stripdebug, :aaptpackage, :jarsign, :zipalign]
+        r.flatten!
+        return r
+      end
+
+      def get_Clean_arg(paclientTool)
+        return '' if @noclean
+        tempfile = Tempfile.new('paclient')
+        tempfile.close
+        tempfile = File.expand_path2(tempfile.path)
+        tempfile.double_delimiters!
+        output = @dccTask.exeoutput
+        output += '\\' + @suffix
+        output.double_delimiters!
+        output = Rake.quotepath('', output)
+        return [output, tempfile].join(',')
+      end
+
+      def get_put_arg(paclientTool)
+        output = @dccTask.exeoutput
+        next_put_arg = put_args[@last_put_arg_index]
+        if next_put_arg.kind_of?(Hash)
+          src, out = next_put_arg.to_a.first
+          out = out.dup
+          if src == :project_so
+            src = out.last
+            src = output + '\\' + src
+          elsif src.kind_of?(Symbol)
+            src = self.send(src)
+            out << src
+          end
+          out = output + '\\' + @suffix + '\\' + out.join(',')
+          arg = src + ',' + out
+        else
+          arg = next_put_arg
+        end
+        arg.double_delimiters!
+        arg = Rake.quotepath('', arg)
+        @last_put_arg_index += 1
+        return arg
+      end
+
+      def find_project_so(deploymentfiles)
+        deploymentfiles.each do |file|
+          return file[:project_so] if file[:project_so]
+        end
+        fail 'Cannot find :project_so in files'
+      end
+
+      def get_stripdebug_arg(paclientTool)
+        stripdebug_path = ENV['DELPHI_ANDROID_SDK_STRIPDEBUG']
+        warn 'Please, set DELPHI_ANDROID_SDK_STRIPDEBUG to path where arm-linux-androideabi-strip.exe is located' unless stripdebug_path
+        stripdebug_path = Rake.quotepath('', stripdebug_path.to_s)
+        output_dest = find_project_so(@deploymentfiles).dup
+        output = @dccTask.exeoutput + '\\' + output_dest.last
+        # remove '1' string
+        output_dest.delete_at(1)
+        output_dest.unshift @dccTask.exeoutput + '\\' + @suffix + '\\'
+        args = [stripdebug_path.double_delimiters, output.double_delimiters, output_dest.join.double_delimiters]
+        return args.join(',')
+      end
+
+      def aapt_args
+        r = ['library', 'classes', 'res', 'assets', :manifest, :jar, :output]
+        return r
+      end
+
+      def manifest
+        'AndroidManifest.xml'
+      end
+
+      def unsigned_path(full = false)
+        r = @dccTask.dpr.pathmap('%n-unsigned.apk')
+        r = @dccTask.exeoutput + '/' + @suffix + '/' + r if full
+        return r
+      end
+
+      def get_aaptpackage_arg(paclientTool)
+        output = @dccTask.exeoutput
+        output_platform = File.expand_path2(output, '-u')
+        apt_path = ENV['DELPHI_ANDROID_SDK_BUILD_TOOLS_PATH']
+        warn 'Please, set DELPHI_ANDROID_SDK_BUILD_TOOLS_PATH to path where aapt.exe is located' unless apt_path
+        apt_path = apt_path.to_s + '\\aapt.exe'
+        apt_path  = Rake.quotepath('', apt_path)
+        args = [apt_path.double_delimiters]
+        args += aapt_args.map do |a|
+           to_mkdir = false
+           out = true
+           if a == :output
+             a = unsigned_path
+           elsif a == :jar
+             platform = ENV['DELPHI_ANDROID_SDK_PLATFORM_PATH']
+             warn 'Please, set DELPHI_ANDROID_SDK_PLATFORM_PATH to the path where android.jar is located' unless platform
+             a = platform.to_s + '\\android.jar'
+             a = Rake.quotepath('', a)
+             out = false
+           else
+             if a.kind_of?(Symbol)
+               a = self.send(a)
+             else
+               # mkdir dirs represented by strings
+               to_mkdir = true
+             end
+           end
+           if out
+             a = '/' + @suffix + '/' + a
+             a_platform = output_platform + a
+             a = output + a
+             if to_mkdir
+               mkdir a_platform unless File.exists?(a_platform)
+             end
+           end
+           a.gsub!('/', '\\')
+           a.double_delimiters!
+           a
+        end
+        return args.join(',')
+      end
+
+      def get_jarsign_arg(paclientTool)
+        jdk_path = ENV['JAVA_SDK_PATH']
+        warn 'Please, set JAVA_SDK_PATH to the path where jarsigner.exe is located' unless jdk_path
+        args = [Rake.quotepath('', jdk_path.to_s + '\\jarsigner.exe')]
+        args << unsigned_path(true).double_delimiters
+        key_store = ENV['DELPHI_ANDROID_KEYSTORE']
+        warn 'Please, set DELPHI_ANDROID_KEYSTORE to the path where keystore (to sign application) located' unless key_store
+        key_store = Rake.quotepath('', key_store.double_delimiters)
+        key_store_params = ENV['DELPHI_ANDROID_KEYSTORE_PARAMS']
+        warn 'Please, set DELPHI_ANDROID_KEYSTORE_PARAMS to alias,method,keystore_password,key_password' unless key_store_params
+        key_alias, key_params = key_store_params.split(',', 2)
+        args << key_alias << key_store << key_params
+        return args.join(',')
+      end
+
+      def get_zipalign_arg(paclientTool)
+        zip_align = ENV['DELPHI_ANDROID_SDK_PLATFORM_TOOLS']
+        warn 'Please, set DELPHI_ANDROID_SDK_PLATFORM_TOOLS to the path where zipalign.exe is located' unless zip_align
+        args = [Rake.quotepath('', zip_align.to_s + '\\zipalign.exe')]
+        args << unsigned_path(true).double_delimiters
+        zip_aligned_out = @dccTask.exeoutput + '\\' + @suffix + '\\' + @dccTask.dpr.pathmap('%n.apk')
+        zip_aligned_out_platform = File.expand_path2(zip_aligned_out, '-u')
+        FileUtils.rm zip_aligned_out_platform if File.exists?(zip_aligned_out_platform)
+        zip_aligned_out.double_delimiters!
+        args << zip_aligned_out
+        args << '4'
+        return args.join(',')
+      end
+
+      def build_args(paclientTool, step)
+        r = ['']
+        arg = ''
+        if step.kind_of?(Symbol)
+          arg = self.send("get_#{step.to_s}_arg", paclientTool)
+        else
+          arg = ''
+        end
+        r << "--#{step.to_s}=#{arg}"
+        return r
+      end
+
+    public
+      def execute(args = nil)
+        super
+        paclientTool = PAClientTool.new
+        paclientTool.class.checkToolFailure(paclientTool.toolpath)
+        exe_cmd = Rake.quotepath('', paclientTool.toolpath)
+        _source = @dccTask.dpr
+        ChDir.new(self, File.dirname(_source)) do |dir|
+          RakeFileUtils.verbose(Logger.debug?) do
+            @last_put_arg_index = 0
+            steps.each do |step|
+              args = build_args(paclientTool, step)
+              args.compact!
+              sh exe_cmd + args.join(' ')
+            end
+            output_platform = File.expand_path2(@dccTask.exeoutput, '-u')
+            mv output_platform.pathmap('%p%s') + @suffix + _source.pathmap('%s%n.apk'), output_platform
+          end
+        end
+      end
+    end # class PAClientTask
+  end
+end

data/lib/rake/delphi/paclienttool.rb

@@ -0,0 +1,20 @@
+# vim: set shiftwidth=2 tabstop=2 expandtab:
+# encoding: utf-8
+
+require 'rake/common/logger'
+require 'rake/delphi/tool'
+
+module Rake
+  module Delphi
+    class PAClientTool < CustomDelphiTool
+      def initialize(checkExistance = false)
+        self.class.reinit
+        super
+      end
+
+      def self.toolName
+        'bin/paclient.exe'
+      end
+    end
+  end
+end

data/lib/rake/delphi/project.rb

@@ -4,6 +4,7 @@ require 'rake'
 require 'rake/common/classes'
 require 'rake/common/libstask'
 require 'rake/delphi/dcc32'
+require 'rake/delphi/paclient'
 require 'rake/helpers/file'
 require 'rake/helpers/raketask'
 require 'rake/helpers/string'
@@ -17,9 +18,10 @@ module Rake
             super
             initvars
             @dcc = application.define_task(Dcc32Task, shortname + ':dcc32')
-            @libs = LibsTask.define('all-delphi-libs', application)
+            @libs = LibsTask.define(name + ':all-delphi-libs', application)
+            @post = application.define_task(PAClientTask, @dcc.shortname + ':post')
             @level = 1
-            enhance([@libs, @dcc])
+            enhance([@libs, @dcc, @post])
         end
 
         def initvars

data/lib/rake/delphi/projectinfo.rb

@@ -68,7 +68,7 @@ module Rake
                 @content = XmlSimple.xml_in(@file, :ForceArray => false)
             else
                 warn "WARNING! Version info file #{@file} does not exists"
-                @content = nil
+                super
             end
         end
 
@@ -96,6 +96,78 @@ module Rake
     end
 
     class XEVersionInfo < RAD2010VersionInfo
+    private
+      def read_file_class(platform, node, hash, key)
+        platforms = node['Platform']
+        unless platforms.kind_of?(Array)
+          platforms = [platforms]
+        end
+        platforms.each do |plat|
+          if plat['Name'].casecmp(platform) == 0
+            # take filename from hash by key
+            value = node.delete(key)
+            # delete Name (it is a filtered platform)
+            plat.delete('Name')
+            # update Platform
+            node['Platform'] = plat
+            node.delete('Platform') if plat.empty?
+            hash.merge!({ value => node })
+          end
+        end
+      end
+
+      def read_files_and_classes(deployment_content, platform)
+        files = {}
+        classes = {}
+        deployment_content.each do |k, v|
+          if k == 'DeployFile'
+            v.each do |file|
+              read_file_class(platform, file, files, 'LocalName')
+            end
+          elsif k == 'DeployClass'
+            v.each do |_class|
+              read_file_class(platform, _class, classes, 'Name')
+            end
+          end
+        end
+        return files, classes
+      end
+
+      def make_deployment(files, classes)
+        r = []
+        files.each do |file, value|
+          value_class = value['Class']
+          _class = classes[value_class]
+          next if ['AndroidGDBServer', 'ProjectAndroidManifest'].include?(value_class)
+          if value_class == 'AndroidClassesDexFile'
+            # dirty hack for 'classes.dex'
+            # usually .dproj has full path to it
+            # but we may have another path
+            # so remove 'first' part
+            file = file.gsub(/^.+(\\lib\\android\\)/, '$(BDS)\1')
+          end
+          remote_name = value['Platform'] ? value['Platform']['RemoteName'] : file.pathmap('%f')
+          if value_class == 'ProjectOutput'
+            file = :project_so
+          end
+          r << { file => [_class['Platform']['RemoteDir'] + '\\', '1', remote_name] }
+        end
+        return r
+      end
+
+    public
+      def deploymentfiles(platform)
+        deployment = @content
+        raise 'There is no deployment info! Cannot continue.' unless deployment
+        ['ProjectExtensions', 'BorlandProject', 'Deployment'].each do |section|
+          deployment = deployment[section]
+          break unless deployment
+        end
+        warn "#{@file} have no deployment info" unless deployment
+        files, classes = read_files_and_classes(deployment, platform)
+        r = make_deployment(files, classes)
+        return r
+      end
     end
 
   end