Amend buck build for Hub so that it builds with resources.

Getting closer to parity with the crazyfun build
johnferro · Sep 7, 2015 · 4d115c6 · 4d115c6
1 parent b54458c
commit 4d115c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -3,8 +3,14 @@ java_library(name = 'grid',
     'internal/**/*.java',
     'web/**/*.java',
   ]),
+  resources = glob([
+    'images/*.css',
+    'images/*.gif',
+    'images/*.ico',
+    'images/*.js',
+    'images/*.png',
+  ]),
   deps = [
-    ':images',
     '//java/client/src/org/openqa/selenium:platform',
     '//java/client/src/org/openqa/selenium/io:io',
     '//java/client/src/org/openqa/selenium/net:net',
@@ -25,12 +31,3 @@ java_library(name = 'grid',
     '//java/server/src/org/openqa/grid/selenium:classes',
   ],
 )
-
-prebuilt_jar(name = 'images',
-  binary_jar = ':images-zip',
-)
-
-zip_file(name = 'images-zip',
-  srcs = glob(['images/*']),
-  out = 'images.jar',
-)
diff --git a/java/server/src/org/openqa/grid/common/BUCK b/java/server/src/org/openqa/grid/common/BUCK
@@ -1,7 +1,7 @@
 java_library(name = 'common',
   srcs = glob(['**/*.java']),
+  resources = glob(['defaults/*.json']),
   deps = [
-    ':defaults',
     '//java/client/src/org/openqa/selenium:platform',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/remote:remote',
@@ -14,12 +14,3 @@ java_library(name = 'common',
     '//java/server/src/org/openqa/grid/selenium:classes',
   ],
 )
-
-prebuilt_jar(name = 'defaults',
-  binary_jar = ':defaults-zip',
-)
-
-zip_file(name = 'defaults-zip',
-  srcs = glob(['defaults/*']),
-  out = 'defaults.jar',
-)