Separating windows and unix/macos code in genrules that collect libs.

SeleniumHQ · Nov 2, 2017 · d59647e · d59647e
1 parent 80adb70
commit d59647e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/java/client/src/org/openqa/selenium/BUCK b/java/client/src/org/openqa/selenium/BUCK
@@ -243,6 +243,7 @@ zip_file(
 genrule(
   name = 'client-libs',
   out = 'libs-sources.jar',
-  cmd = 'mkdir libs && python -c "import sys,shutil;map(lambda f:shutil.copy(f,\'libs\'),[l for l in open(sys.argv[1][1:]).read().split(\';\' if sys.platform.startswith(\'win\') else \':\') if l.endswith(\'.jar\') and \'third_party/java\' in l.replace(\'\\\\\'\',\'/\')])" $(@classpath :client-combined) && jar cMf $OUT libs/*',
+  bash = 'mkdir libs && python -c "import sys,shutil;map(lambda f:shutil.copy(f,\'libs\'),[l for l in open(sys.argv[1][1:]).read().split(\':\') if l.endswith(\'.jar\') and \'third_party/java\' in l])" $(@classpath :client-combined) && jar cMf $OUT libs/*',
+  cmd_exe = 'mkdir libs && python -c "import sys,shutil;map(lambda f:shutil.copy(f,\'libs\'),[l for l in open(sys.argv[1][1:]).read().split(\';\') if l.endswith(\'.jar\') and \'third_party\\java\' in l])" $(@classpath :client-combined) && jar cMf $OUT libs/*',
 )
 
diff --git a/java/server/src/org/openqa/grid/selenium/BUCK b/java/server/src/org/openqa/grid/selenium/BUCK
@@ -93,5 +93,6 @@ zip_file(
 genrule(
   name = 'server-libs',
   out = 'server-libs-sources.jar',
-  cmd = 'mkdir libs && python -c "import sys,shutil;map(lambda f:shutil.copy(f,\'libs\'),[l for l in open(sys.argv[1][1:]).read().split(\';\' if sys.platform.startswith(\'win\') else \':\') if l.endswith(\'.jar\') and \'third_party/java\' in l.replace(\'\\\\\'\',\'/\')])" $(@classpath :selenium) && jar cMf $OUT libs/*',
+  bash = 'mkdir libs && python -c "import sys,shutil;map(lambda f:shutil.copy(f,\'libs\'),[l for l in open(sys.argv[1][1:]).read().split(\':\') if l.endswith(\'.jar\') and \'third_party/java\' in l])" $(@classpath :selenium) && jar cMf $OUT libs/*',
+  cmd_exe = 'mkdir libs && python -c "import sys,shutil;map(lambda f:shutil.copy(f,\'libs\'),[l for l in open(sys.argv[1][1:]).read().split(\';\') if l.endswith(\'.jar\') and \'third_party\\java\' in l])" $(@classpath :selenium) && jar cMf $OUT libs/*',
 )