packager 0.0.7 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -89,11 +89,17 @@ module Packager
89
89
  # too early. This means that the GEM_HOME gets set incorrectly and the
90
90
  # standalone bundle is not built properly
91
91
  original_rubyopt = ENV['RUBYOPT']
92
+
93
+ # Empty PKG_CONFIG_LIBDIR so if we have MacPorts, those libs aren't used
94
+ original_pkg_config_libdir = ENV['PKG_CONFIG_LIBDIR']
95
+
92
96
  begin
93
- ENV['RUBYOPT'] = original_rubyopt.sub("-rbundler/setup", '')
97
+ ENV['RUBYOPT'] = original_rubyopt.sub("-rbundler/setup", '') if original_rubyopt
98
+ ENV['PKG_CONFIG_LIBDIR'] = ''
94
99
  sh 'bundle --standalone --without development'
95
100
  ensure
96
101
  ENV['RUBYOPT'] = original_rubyopt
102
+ ENV['PKG_CONFIG_LIBDIR'] = original_pkg_config_libdir
97
103
  end
98
104
  end
99
105
  rescue Exception => e
@@ -185,13 +191,6 @@ module Packager
185
191
  task :make_pkg => make_pkg_tasks
186
192
  end
187
193
 
188
- def create_rm_task
189
- # TODO: Remove more fully
190
- task :rm do
191
- rm_rf package_name
192
- end
193
- end
194
-
195
194
  end
196
195
  end
197
196
  end
@@ -17,7 +17,6 @@ module Packager
17
17
  create_bin_files_task
18
18
  create_resource_files_task
19
19
  create_make_pkg_task
20
- create_rm_task
21
20
  create_directory_tasks
22
21
  create_distribution_file_task
23
22
  create_package_info_file_task
@@ -122,6 +121,12 @@ module Packager
122
121
 
123
122
  file "#{package_name}.pkg" => pkg_dependencies do
124
123
  sh "pkgutil --flatten #{short_package_name}-pkg #{package_name}.pkg"
124
+
125
+ unless ENV['NOCLEAN']
126
+ # Cleanup
127
+ rm_rf package_name
128
+ rm_rf "#{short_package_name}-pkg"
129
+ end
125
130
  end
126
131
  end
127
132
  end
@@ -22,7 +22,6 @@ module Packager
22
22
  create_bin_file_aliases_task
23
23
  create_resource_files_task
24
24
  create_make_pkg_task
25
- create_rm_task
26
25
 
27
26
  create_ruby_download_task
28
27
  create_iss_task
@@ -111,6 +110,11 @@ END
111
110
  puts "Compiling. This may take a while..."
112
111
  sh %{"#{inno_dir}Compil32.exe" /cc "#{package_name}\\packager.iss"}
113
112
  mv "#{package_name}/Output/setup.exe", "#{package_name}.exe"
113
+
114
+ unless ENV['NOCLEAN']
115
+ # Cleanup
116
+ rm_rf package_name
117
+ end
114
118
  end
115
119
  end
116
120
 
@@ -1,4 +1,4 @@
1
1
  module Packager
2
- VERSION = "0.0.7"
2
+ VERSION = "0.1.0"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: packager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-08-24 00:00:00.000000000Z
13
+ date: 2011-08-31 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: bundler
17
- requirement: &70243143033800 !ruby/object:Gem::Requirement
17
+ requirement: &70354261787420 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,7 +22,7 @@ dependencies:
22
22
  version: 1.1.pre.4
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *70243143033800
25
+ version_requirements: *70354261787420
26
26
  description: A tool for creating a standalone Mac OS X .pkg of your gem.
27
27
  email:
28
28
  - wycats@gmail.com