Skip to content
Browse files

Pull out remaining references to native_code and native_jar since we'…

…re not using them
  • Loading branch information...
1 parent 9ebfca2 commit 7bd7fa7768d446cb86a1b862e8a01553bbbb4607 Noah Gibbs committed
Showing with 0 additions and 44 deletions.
  1. +0 −24 Rakefile
  2. +0 −2 ci_jobs/hastur-integrations/run.sh
  3. +0 −2 ci_jobs/hastur-units/run.sh
  4. +0 −9 lib/hastur-server/api/v2.rb
  5. +0 −7 test/test_helper.rb
View
24 Rakefile
@@ -125,7 +125,6 @@ if ARGV.include?("retrieval_war")
# See config/warble.rb for explanation of config variables
config.dirs = %w(lib tools)
config.excludes = ALL_EXCLUDES
- config.java_libs += ["lib/hastur-server/native/native_code.jar"]
config.bundler = false # This doesn't seem to turn off the gemspec
config.gem_dependencies = true
config.webserver = 'jetty'
@@ -136,7 +135,6 @@ if ARGV.include?("retrieval_war")
end
# Workaround for Warbler bug (https://github.com/jruby/warbler/issues/86)
task :retrieval_war => :delete_jars
-task :retrieval_war => :native_jar
Warbler::Task.new("core_jar", Warbler::Config.new do |config|
config.traits = [ "jar" ]
@@ -150,28 +148,6 @@ Warbler::Task.new("core_jar", Warbler::Config.new do |config|
end)
task :core_jar => :delete_jars
-# Eventually this will get really slow and I'll have to do it in a more
-# reasonable way.
-task :native_jar do
- Dir.chdir File.join(File.dirname(__FILE__), "lib", "hastur-server", "native")
-
- Dir["**/*.class"].each { |f| File.unlink f }
-
- unless Dir["*.java"].empty?
- system "javac *.java"
- unless $?.success?
- raise "Couldn't compile java files!"
- end
- end
-
- system "jar -cf native_code.jar `find . -name '*.class\'`"
- unless $?.success?
- raise "Couldn't archive java/scala class files to jar!"
- end
-
- Dir.chdir File.dirname(__FILE__)
-end
-
#
# undesirable but useful hacks follow ...
#
View
2 ci_jobs/hastur-integrations/run.sh
@@ -35,8 +35,6 @@ rm -f hastur-server-*.gem
gem build hastur-server.gemspec
gem install hastur-server-*.gem
-rake native_jar
-
gem env
echo "------------ Bundler-ized environment -----"
bundle exec gem env
View
2 ci_jobs/hastur-units/run.sh
@@ -22,6 +22,4 @@ bundle update
# just in case we installed some executables...
rbenv rehash
-rake native_jar
-
COVERAGE=true bundle exec rake --trace test:units:full
View
9 lib/hastur-server/api/v2.rb
@@ -672,15 +672,6 @@ def initialize(*args)
end
end
- get "/v2/scala" do
- require "native_code" # Use native_code.jar
- import "ScalaMain"
-
- sc_obj = ScalaMain.new
-
- "From scala: #{sc_obj.scala_string} / #{sc_obj.scala_computation(7)}\n"
- end
-
#
# Implement the Sinatra forward method so bad requests don't try to pass through
# to the superclass and return 404 right away.
View
7 test/test_helper.rb
@@ -11,13 +11,6 @@
# For testing Hastur components, use the local version *first*.
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
-# Require native code
-begin
- require "hastur-server/native/native_code" if RUBY_PLATFORM == "java"
-rescue
- raise "Please build native code using 'rake native_jar'!"
-end
-
# Easy-to-spot fake UUIDs
A1UUID = '11111111-2222-3333-4444-555555555555'
A2UUID = 'ffffffff-eeee-dddd-cccc-bbbbbbbbbbbb'

0 comments on commit 7bd7fa7

Please sign in to comment.
Something went wrong with that request. Please try again.