Fix path used in generated prolog class names
Force relative paths by passing the Prolog compiler only a relative name from within $SRCDIR. This avoids picking up the user's $HOME path as part of the generated class file names, and prevents build failures on filesystems where individual path components are limited to 256 bytes. Change-Id: I43f2a93daf857413401f4e1aeb24b9b2a8c741fe
This commit is contained in:
@@ -1 +1 @@
|
||||
307f5f7155b8abf18097341d58864de1e1d3eb1c
|
||||
902da64779068acd3acb5bc193045ee15a34dc85
|
||||
|
@@ -40,9 +40,9 @@ java_library2(
|
||||
'//gerrit-httpd:httpd',
|
||||
'//gerrit-lucene:lucene',
|
||||
'//gerrit-openid:openid',
|
||||
'//gerrit-server:common_rules',
|
||||
'//gerrit-reviewdb:server',
|
||||
'//gerrit-server:server',
|
||||
'//gerrit-server/src/main/prolog:common',
|
||||
'//gerrit-solr:solr',
|
||||
'//gerrit-sshd:sshd',
|
||||
'//gerrit-util-cli:cli',
|
||||
|
@@ -1,5 +1,3 @@
|
||||
include_defs('//lib/prolog/prolog.defs')
|
||||
|
||||
SRCS = glob(['src/main/java/**/*.java'])
|
||||
RESOURCES = glob(['src/main/resources/**/*'])
|
||||
|
||||
@@ -60,20 +58,13 @@ java_sources(
|
||||
visibility = ['PUBLIC'],
|
||||
)
|
||||
|
||||
prolog_cafe_library(
|
||||
name = 'common_rules',
|
||||
srcs = ['src/main/prolog/gerrit_common.pl'],
|
||||
deps = [':server'],
|
||||
visibility = ['PUBLIC'],
|
||||
)
|
||||
|
||||
java_test(
|
||||
name = 'server_tests',
|
||||
srcs = glob(['src/test/java/**/*.java']),
|
||||
resources = glob(['src/test/resources/**/*']),
|
||||
deps = [
|
||||
':server',
|
||||
':common_rules',
|
||||
'//gerrit-server/src/main/prolog:common',
|
||||
'//gerrit-antlr:query_exception',
|
||||
'//gerrit-antlr:query_parser',
|
||||
'//gerrit-common:server',
|
||||
|
8
gerrit-server/src/main/prolog/BUCK
Normal file
8
gerrit-server/src/main/prolog/BUCK
Normal file
@@ -0,0 +1,8 @@
|
||||
include_defs('//lib/prolog/prolog.defs')
|
||||
|
||||
prolog_cafe_library(
|
||||
name = 'common',
|
||||
srcs = ['gerrit_common.pl'],
|
||||
deps = ['//gerrit-server:server'],
|
||||
visibility = ['PUBLIC'],
|
||||
)
|
@@ -8,8 +8,8 @@ java_library2(
|
||||
'//gerrit-lucene:lucene',
|
||||
'//gerrit-openid:openid',
|
||||
'//gerrit-reviewdb:server',
|
||||
'//gerrit-server:common_rules',
|
||||
'//gerrit-server:server',
|
||||
'//gerrit-server/src/main/prolog:common',
|
||||
'//gerrit-solr:solr',
|
||||
'//gerrit-sshd:sshd',
|
||||
'//lib:gwtorm',
|
||||
|
@@ -19,7 +19,9 @@ def prolog_cafe_library(
|
||||
visibility = []):
|
||||
genrule(
|
||||
name = name + '__pl2j',
|
||||
cmd = '$(exe //lib/prolog:compiler) $SRCS $DEPS $OUT',
|
||||
cmd = 'cd $SRCDIR;$(exe //lib/prolog:compiler) $DEPS ' +
|
||||
' '.join(srcs) +
|
||||
' $OUT',
|
||||
srcs = srcs,
|
||||
deps = ['//lib/prolog:compiler'],
|
||||
out = name + '.src.zip',
|
||||
|
Reference in New Issue
Block a user