Skip to content

Commit 52711fc

Browse files
smillstmernst
andauthored
Change release process to account for putting AFU in CF repo. (#7185)
Co-authored-by: Michael Ernst <mernst@cs.washington.edu>
1 parent 4e96734 commit 52711fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+607
-1983
lines changed

.gitignore

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,19 @@ manual003.gif
8888
manual003.png
8989
manual004.gif
9090
manual004.png
91+
docs/annotation-file-utilities/annotation-file-format.html
92+
docs/annotation-file-utilities/annotation-file-format.htoc
93+
docs/annotation-file-utilities/annotation-file-format.log
94+
docs/annotation-file-utilities/annotation-file-format.pdf
95+
docs/annotation-file-utilities/annotation-file-format.toc
96+
docs/annotation-file-utilities/corresp.png
97+
docs/annotation-file-utilities/dataflow.png
98+
docs/annotation-file-utilities/figures/corresp.png
99+
docs/annotation-file-utilities/figures/dataflow.png
100+
docs/annotation-file-utilities/figures/nocast.png
101+
docs/annotation-file-utilities/figures/typecast.png
102+
docs/annotation-file-utilities/nocast.png
103+
docs/annotation-file-utilities/typecast.png
91104
docs/examples/**/*.class
92105
docs/examples/MavenExample/Out.txt
93106
docs/examples/errorprone/.gradle/
@@ -107,11 +120,11 @@ docs/tmpapi/
107120
*.fls
108121

109122
# dataflow manual
110-
dataflow/manual/dataflow.aux
111-
dataflow/manual/dataflow.dvi
112-
dataflow/manual/dataflow.log
113-
dataflow/manual/dataflow.out
114-
dataflow/manual/dataflow.pdf
123+
dataflow/manual/checker-framework-dataflow-manual.aux
124+
dataflow/manual/checker-framework-dataflow-manual.dvi
125+
dataflow/manual/checker-framework-dataflow-manual.log
126+
dataflow/manual/checker-framework-dataflow-manual.out
127+
dataflow/manual/checker-framework-dataflow-manual.pdf
115128

116129
docs/tutorial/src/personalblog-demo/bin/net/eyde/personalblog/service/PersonalBlogService.class
117130
docs/tutorial/src/personalblog-demo/bin/net/eyde/personalblog/struts/action/ReadAction.class
@@ -199,8 +212,8 @@ annotation-file-utilities/annotation-file-format.out
199212
annotation-file-utilities/annotation-file-format.pdf
200213
annotation-file-utilities/annotation-file-format.ps
201214
annotation-file-utilities/annotation-file-format.toc
202-
annotation-file-utilities/annotation-file-utilities.jar
203-
annotation-file-utilities/annotation-file-utilities-all.jar
215+
annotation-file-utilities/dist/annotation-file-utilities.jar
216+
annotation-file-utilities/dist/annotation-file-utilities-all.jar
204217
annotation-file-utilities/annotation-file-utilities-all-but-javac.jar
205218
annotation-file-utilities/annotation-tools.zip
206219
annotation-file-utilities/plume-bib

LICENSE.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ the parts that you might want to include with your own program.
1717
third-party annotations (in checker/src/testannotations/,
1818
framework/src/main/java/org/jmlspecs/, and
1919
framework/src/main/java/com/google/).
20+
2021
* Annotation Tools (in directory annotation-file-utilities/) uses the MIT
2122
license.
2223

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Permission is hereby granted, free of charge, to any person obtaining a copy
2+
of this software and associated documentation files (the "Software"), to deal
3+
in the Software without restriction, including without limitation the rights
4+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
5+
copies of the Software, and to permit persons to whom the Software is
6+
furnished to do so, subject to the following conditions:
7+
8+
The above copyright notice and this permission notice shall be included in
9+
all copies or substantial portions of the Software.
10+
11+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
12+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
15+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
17+
THE SOFTWARE.

annotation-file-utilities/README.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

annotation-file-utilities/annotation-file-format.bbl

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
SCENE_LIB=$(dirname "$0")
66
WORKSPACE=$SCENE_LIB/..
77

8-
export CLASSPATH="$WORKSPACE"/annotation-file-utilities-all.jar:"$CLASSPATH"
8+
export CLASSPATH="$WORKSPACE"/dist/annotation-file-utilities-all.jar:"$CLASSPATH"
99
java org.checkerframework.afu.scenelib.tools.Anncat "$@"

annotation-file-utilities/scripts/extract-annotations renamed to annotation-file-utilities/bin/extract-annotations

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ while [ "$#" -gt 0 ]; do
2828
done
2929

3030
AFU=${AFU:-$(dirname "$0")/..}
31-
ANNOTATION_FILE_UTILS=${AFU}/annotation-file-utilities-all.jar
31+
ANNOTATION_FILE_UTILS=${AFU}/dist/annotation-file-utilities-all.jar
3232

3333
JAVAC_JAR=${JAVAC_JAR:-${AFU}/lib/javac-9+181-r4173-1.jar}
3434

annotation-file-utilities/scripts/extract-annotations.bat renamed to annotation-file-utilities/bin/extract-annotations.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:: This only works with Java 9+.
66
set ANNOTATION_FILE_UTILS=%~d0
77
set ANNOTATION_FILE_UTILS=%ANNOTATION_FILE_UTILS%%~p0
8-
set ANNOTATION_FILE_UTILS=%ANNOTATION_FILE_UTILS%\..\annotation-file-utilities-all.jar
8+
set ANNOTATION_FILE_UTILS=%ANNOTATION_FILE_UTILS%\..\dist\annotation-file-utilities-all.jar
99
set JAVAC_JAR=%ANNOTATION_FILE_UTILS%\annotation-file-utilities\lib\javac-9+181-r4173-1.jar
1010

1111
java -ea -cp "%JAVAC_JAR%;%ANNOTATION_FILE_UTILS%;%CLASSPATH%" ClassFileReader %*

annotation-file-utilities/scripts/insert-annotations renamed to annotation-file-utilities/bin/insert-annotations

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ while [ "$#" -gt 0 ]; do
2828
done
2929

3030
AFU=${AFU:-$(dirname "$0")/..}
31-
ANNOTATION_FILE_UTILS="${AFU}/annotation-file-utilities-all.jar"
31+
ANNOTATION_FILE_UTILS="${AFU}/dist/annotation-file-utilities-all.jar"
3232
JAVAC_JAR="${JAVAC_JAR:-${AFU}/lib/javac-9+181-r4173-1.jar}"
3333

3434
if java -version 2>&1 | grep version | grep 1.8 > /dev/null; then

annotation-file-utilities/scripts/insert-annotations-to-source renamed to annotation-file-utilities/bin/insert-annotations-to-source

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ done
3030
AFUSCRIPTS=$(dirname "$0")
3131
AFU=$(cd "$AFUSCRIPTS/.." > /dev/null 2>&1 && pwd)
3232

33-
ANNOTATION_FILE_UTILS=${ANNOTATION_FILE_UTILS:-${AFU}/annotation-file-utilities-all.jar}
33+
ANNOTATION_FILE_UTILS=${ANNOTATION_FILE_UTILS:-${AFU}/dist/annotation-file-utilities-all.jar}
3434
JAVAC_JAR=${JAVAC_JAR:-${AFU}/lib/javac-9+181-r4173-1.jar}
3535

3636
if java -version 2>&1 | grep version | grep 1.8 > /dev/null; then

0 commit comments

Comments
 (0)