Skip to content

Makefile: Change validate-canonical-match source from '.' to 'src' #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2018
Merged

Makefile: Change validate-canonical-match source from '.' to 'src' #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67001a
Makefile: Change default test-data location
wking Jan 26, 2018
fe10a2c
Makefile: Change validate-canonical-match source from '.' to 'src'
wking Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ matrix:
include:
- language: java
script:
- make TEST_DATA=test/simpleTestForGenerator validate-canonical-match
- make validate-canonical-match
- language: node_js
node_js:
- "node"
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
TOOL_VERSION = 2.1.9
TEST_DATA = ../license-test-files
TEST_DATA = test/simpleTestForGenerator

.PHONY: validate-canonical-match
validate-canonical-match: spdx-tools-$(TOOL_VERSION).jar-valid resources/licenses-full.json $(TEST_DATA) .tmp
java -jar -DLocalFsfFreeJson=true spdx-tools-$(TOOL_VERSION).jar LicenseRDFAGenerator . .tmp 1.0 2000-01-01 $(TEST_DATA) expected-warnings
java -jar -DLocalFsfFreeJson=true spdx-tools-$(TOOL_VERSION).jar LicenseRDFAGenerator src .tmp 1.0 2000-01-01 $(TEST_DATA) expected-warnings

.PRECIOUS: spdx-tools-%.jar
spdx-tools-%.jar:
Expand Down