diff --git a/create_release.sh b/create_release.sh index 325b773ebd539d788c094ddb64d34577e6068189..46ff9f49926e074391e09f054162df083a3a263c 100755 --- a/create_release.sh +++ b/create_release.sh @@ -1,10 +1,11 @@ #!/bin/bash +git clean -d -x -f mkdir -p ModelValidationWithRAGs/trainbenchmark mkdir -p ModelValidationWithRAGs/docker-results/ mkdir -p ModelValidationWithRAGs/docker-diagrams/ cp -a \ - .editorconfig .dockerignore \ + .dockerignore \ README.{md,html,txt} AUTHORS.txt \ Dockerfile docker/ run_docker.sh \ paper-results/ \ @@ -13,14 +14,11 @@ cp -a \ ModelValidationWithRAGs/ # the target directory # remove build and gradle files -rm -r ModelValidationWithRAGs/trainbenchmark/*/build -rm -r ModelValidationWithRAGs/trainbenchmark/.gradle +rm -rf ModelValidationWithRAGs/trainbenchmark/*/build +rm -rf ModelValidationWithRAGs/trainbenchmark/.gradle # remove generate files -rm -r ModelValidationWithRAGs/trainbenchmark/*/src/main/java-gen/* -rm ModelValidationWithRAGs/trainbenchmark/trainbenchmark-tool-jastadd-specialized-base/src/main/jastadd/TrainGen.* +rm -rf ModelValidationWithRAGs/trainbenchmark/*/src/main/java-gen/* +rm -f ModelValidationWithRAGs/trainbenchmark/trainbenchmark-tool-jastadd-specialized-base/src/main/jastadd/TrainGen.* +rm ModelValidationWithRAGs/preprocessor/.gitignore -echo "Now please run 'sudo docker save --output ModelValidationWithRAGs/trainbenchmark-docker.tar trainbenchmark && chown $(whoami):$(whoami) ModelValidationWithRAGs/trainbenchmark-docker.tar'" - -# todos -# preprocessor/.classpath missing -# also preprocessor/tests/errors/{Errors.out,Inheritance.out} +echo "Now please run 'sudo docker save --output ModelValidationWithRAGs/trainbenchmark-docker.tar trainbenchmark && sudo chown $(whoami):$(whoami) ModelValidationWithRAGs/trainbenchmark-docker.tar'" diff --git a/expected_tar_content b/expected_tar_content index aff7e4a8a70cb0de2ef6651e6c05ee332d0c8d41..bbc5f9fa9ef287bdf925e9b1bb8199250488e8e0 100644 --- a/expected_tar_content +++ b/expected_tar_content @@ -1,6 +1,7 @@ . ./run_docker.sh ./preprocessor +./preprocessor/LICENSE.txt ./preprocessor/src ./preprocessor/src/java ./preprocessor/src/java/org @@ -19,7 +20,6 @@ ./preprocessor/src/java/org/jastadd/relast/compiler/options/Option.java ./preprocessor/src/java/org/jastadd/relast/compiler/Compiler.java ./preprocessor/src/java/org/jastadd/relast/compiler/Utils.java -./preprocessor/src/generated ./preprocessor/tools ./preprocessor/tools/junit-4.11-SNAPSHOT.jar ./preprocessor/tools/JFlex.jar @@ -254,42 +254,21 @@ ./preprocessor/examples/TrainBenchmark.relast ./preprocessor/examples/TrainBenchmarkGen.jadd ./preprocessor/examples/All.relast -./preprocessor/.classpath ./preprocessor/relast-compiler.jar ./preprocessor/tests ./preprocessor/tests/valid -./preprocessor/tests/valid/AST -./preprocessor/tests/valid/AST/Root.java -./preprocessor/tests/valid/AST/C.java -./preprocessor/tests/valid/AST/AttributeValue.java -./preprocessor/tests/valid/AST/B.java -./preprocessor/tests/valid/AST/ASTState.java -./preprocessor/tests/valid/AST/Opt.java -./preprocessor/tests/valid/AST/List.java -./preprocessor/tests/valid/AST/ASTNode.java -./preprocessor/tests/valid/AST/Pair.java -./preprocessor/tests/valid/AST/A.java -./preprocessor/tests/valid/AST/ASTNodeAnnotation.java -./preprocessor/tests/valid/LowerBoundsGen.ast ./preprocessor/tests/valid/.gitignore ./preprocessor/tests/valid/Utils.jadd ./preprocessor/tests/valid/LowerBounds.java -./preprocessor/tests/valid/AllGen.jadd ./preprocessor/tests/valid/AbstractTests.java ./preprocessor/tests/valid/All.relast -./preprocessor/tests/valid/LowerBoundsGen.jadd -./preprocessor/tests/valid/AllGen.ast ./preprocessor/tests/valid/Makefile ./preprocessor/tests/valid/LowerBounds.relast -./preprocessor/tests/valid/AllGenGen.ast -./preprocessor/tests/valid/AllGenGen.jadd ./preprocessor/tests/valid/All.java ./preprocessor/tests/errors ./preprocessor/tests/errors/Errors.relast ./preprocessor/tests/errors/.gitignore ./preprocessor/tests/errors/Inheritance.expected -./preprocessor/tests/errors/Errors.out -./preprocessor/tests/errors/Inheritance.out ./preprocessor/tests/errors/Makefile ./preprocessor/tests/errors/Inheritance.relast ./preprocessor/tests/errors/Errors.expected @@ -971,9 +950,6 @@ ./trainbenchmark/trainbenchmark-tool-jastadd-base/libs ./trainbenchmark/trainbenchmark-tool-jastadd-base/libs/jastadd2.jar ./trainbenchmark/trainbenchmark-tool-jastadd-base/libs/relast-compiler.jar -./trainbenchmark/trainbenchmark-tool-jastadd-base/out -./trainbenchmark/trainbenchmark-tool-jastadd-base/out/production -./trainbenchmark/trainbenchmark-tool-jastadd-base/out/production/classes ./trainbenchmark/trainbenchmark-tool-jastadd-base/.editorconfig ./trainbenchmark/logs ./trainbenchmark/logs/.gitignore @@ -1095,10 +1071,6 @@ ./trainbenchmark/trainbenchmark-tool/src/main/java/hu/bme/mit/trainbenchmark/benchmark/matches/ConnectedSegmentsMatch.java ./trainbenchmark/trainbenchmark-tool/src/main/java/hu/bme/mit/trainbenchmark/benchmark/memory ./trainbenchmark/trainbenchmark-tool/src/main/java/hu/bme/mit/trainbenchmark/benchmark/memory/MemoryResult.java -./trainbenchmark/trainbenchmark-tool/out -./trainbenchmark/trainbenchmark-tool/out/production -./trainbenchmark/trainbenchmark-tool/out/production/resources -./trainbenchmark/trainbenchmark-tool/out/production/resources/.gitignore ./trainbenchmark/trainbenchmark-tool/build.properties ./trainbenchmark/settings.gradle ./trainbenchmark/trainbenchmark-reporting @@ -1146,7 +1118,6 @@ ./trainbenchmark/trainbenchmark-format-emf-model ./trainbenchmark/trainbenchmark-format-emf-model/build.gradle ./trainbenchmark/trainbenchmark-format-emf-model/plugin.xml -./trainbenchmark/trainbenchmark-format-emf-model/xtend-gen ./trainbenchmark/trainbenchmark-format-emf-model/src ./trainbenchmark/trainbenchmark-format-emf-model/src/railway.xcore ./trainbenchmark/trainbenchmark-format-emf-model/.gitignore diff --git a/validate_release.sh b/validate_release.sh index be83a3fbfd404e0918e9c8601c5f5f6229aebb7a..3a583563198ed49d9fb942aa1b440c722bf9ad17 100755 --- a/validate_release.sh +++ b/validate_release.sh @@ -1 +1 @@ -meld <(expected_tar_content) <(find ModelValidationWithRAGs/) +meld expected_tar_content <(cd ModelValidationWithRAGs/;find)