Skip to content

Commit 176fdb0

Browse files
committed
The distribution zip no longer uses "dist/" as the root folder (that was an accident introduced when switching from ant to rake). Also, when zipping up the files, they are deleted from the package directory. So 'rake dist' now results in just the distribution zip archive inside the dist folder.
1 parent fb8ccdf commit 176fdb0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Rakefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ PATCHES = 'jruby_for_max'
1919
LICENSE = 'license'
2020
BUILD = 'build'
2121
DIST = 'dist'
22-
PACKAGE = "#{DIST}/jruby_for_max-#{PROJECT_VERSION}"
22+
PROJ = "jruby_for_max-#{PROJECT_VERSION}"
23+
PACKAGE = "#{DIST}/#{PROJ}"
2324

2425
SOURCES = FileList["#{SRC}/**/*.java"].exclude(/Test\.java$/)
2526
CLASSPATH = FileList["#{LIB}/**/*.jar"].exclude(/^jruby_for_max.jar$/)
@@ -85,9 +86,9 @@ end
8586
desc 'construct the distribution archive'
8687
task :dist => [:replace_vars] do
8788
mkdir DIST
88-
archive = "#{PACKAGE}.zip"
89-
puts "Archiving distribution: #{archive}"
90-
`zip -l -r #{archive} #{PACKAGE}`
89+
archive = "#{PROJ}.zip"
90+
puts "Archiving distribution: #{DIST}/#{archive}"
91+
`cd #{DIST} && zip -l -m -r #{archive} #{PROJ}`
9192
# The -l option converts newlines to crlf, which should display correctly on both OS X and Windows.
9293
# Otherwise, since I write these txt files on OS X, newlines would disappear when viewed in Notepad on Windows.
9394
end

0 commit comments

Comments
 (0)