Move files in misc/ to resources/ and dev/.

phusion · Nov 14, 2010 · 1d19a86 · 1d19a86
1 parent 1fe7b1e
commit 1d19a86
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/DEVELOPERS.TXT b/DEVELOPERS.TXT
@@ -45,6 +45,8 @@ The most important directories are:
   Source code shared by the Apache and Nginx modules.
 [ bin ]
   User executables.
+[ helper-scripts ]
+  Scripts used during runtime, but not directly executed by the user.
 [ doc ]
   Various documentation.
 [ test ]
@@ -63,14 +65,14 @@ Less important directories:
   functionality necessary for writing robust server software. It provides
   things like support for interruptable system calls and portable backtraces
   for C++. Boost was modified to make use of the functionality provided by OXT.
-[ benchmark ]
-  Benchmark tools.
+[ dev ]
+  Tools for Phusion Passenger developers. Not used during production.
+[ resources ]
+  Various resource files, used during production.
 [ debian ]
   Debian packaging files.
 [ man ]
   Man pages.
-[ misc ]
-  Miscellaneous tools.
 [ build ]
   Rake tasks used by the build system.
 

diff --git a/build/packaging.rb b/build/packaging.rb
@@ -144,7 +144,7 @@
 	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
 
 	sh "mkdir -p #{fake_certificates_dir}"
-	sh "cp misc/*.crt #{fake_certificates_dir}/"
+	sh "cp resources/*.crt #{fake_certificates_dir}/"
 
 	sh "mkdir -p #{fake_source_root}"
 	spec.files.each do |filename|

diff --git a/misc/copy_boost_headers.rb → dev/copy_boost_headers.rb b/misc/copy_boost_headers.rb → dev/copy_boost_headers.rb
diff --git a/misc/find_owner_pipe_leaks.rb → dev/find_owner_pipe_leaks.rb b/misc/find_owner_pipe_leaks.rb → dev/find_owner_pipe_leaks.rb
diff --git a/misc/render_error_pages.rb → dev/render_error_pages.rb b/misc/render_error_pages.rb → dev/render_error_pages.rb
diff --git a/ext/common/ResourceLocator.h b/ext/common/ResourceLocator.h
@@ -74,7 +74,7 @@ class ResourceLocator {
 		if (nativelyPackaged) {
 			return "/usr/share/phusion-passenger/certificates";
 		} else {
-			return root + "/misc";
+			return root + "/resources";
 		}
 	}
 };

diff --git a/lib/phusion_passenger/packaging.rb b/lib/phusion_passenger/packaging.rb
@@ -85,7 +85,8 @@ module Packaging
 		'ext/oxt/*.cpp',
 		'ext/oxt/detail/*.hpp',
 		'ext/ruby/*.{c,rb}',
-		'misc/*',
+		'dev/*',
+		'resources/*',
 		'test/*.example',
 		'test/support/*.{cpp,h,rb}',
 		'test/tut/*',

diff --git a/lib/phusion_passenger/standalone/start_command.rb b/lib/phusion_passenger/standalone/start_command.rb
@@ -157,7 +157,7 @@ def parse_my_options
 				wrap_desc("The spawn method to use (default: #{@options[:spawn_method]})")) do |value|
 				@options[:spawn_method] = value
 			end
-			opts.on("--union-station-key", String,
+			opts.on("--union-station-key KEY", String,
 				wrap_desc("Specify Union Station key")) do |value|
 				@options[:union_station_key] = value
 			end

diff --git a/misc/union_station_gateway.crt → resources/union_station_gateway.crt b/misc/union_station_gateway.crt → resources/union_station_gateway.crt