stash

jvalkeal · Aug 30, 2024 · 9e6b29f · 9e6b29f
1 parent 6a716f4
commit 9e6b29f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/shell/gradle/JavaConventions.java b/buildSrc/src/main/java/org/springframework/shell/gradle/JavaConventions.java
@@ -52,7 +52,7 @@ void apply(Project project) {
 	private void configureJavadocConventions(Project project) {
 		project.getTasks().withType(Javadoc.class, (javadoc) -> {
 			CoreJavadocOptions options = (CoreJavadocOptions) javadoc.getOptions();
-			options.source("17");
+			// options.source("17");
 			options.encoding("UTF-8");
 			options.addStringOption("Xdoclint:none", "-quiet");
 		});

diff --git a/scripts/generate-ts.sh b/scripts/generate-ts.sh
@@ -5,6 +5,22 @@ find_basedir() {
   echo "${basedir}"
 }
 
+dojextract='false'
+dozig='false'
+
+print_usage() {
+  echo "Usage: generate-ts.sh [-j] [-z]"
+}
+
+while getopts 'jz' flag; do
+  case "${flag}" in
+    j) dojextract='true' ;;
+    z) dozig='true' ;;
+    *) print_usage
+       exit 1 ;;
+  esac
+done
+
 TMPDIR=/tmp/spring-shell-ts
 rm -fr $TMPDIR
 
@@ -18,17 +34,21 @@ git clone --depth 1 -b $TAG https://github.com/$GHOWNER/$GHREPO.git $REPOPATH
 mkdir -p $TARGETMODULEPATH/src/ts
 cp $REPOPATH/lib/include/tree_sitter/api.h $TARGETMODULEPATH/src/ts/
 
-jextract --header-class-name TreeSitter --output $TARGETMODULEPATH/src/main/java -t org.springframework.shell.treesitter.ts $TARGETMODULEPATH/src/ts/api.h
+if [ "$dojextract" == "true" ]; then
+  jextract --header-class-name TreeSitter --output $TARGETMODULEPATH/src/main/java -t org.springframework.shell.treesitter.ts $TARGETMODULEPATH/src/ts/api.h
+fi
 
-mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Linux/x86_64
-mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64
-mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64
-mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/arm64
-ZIGFILES=$REPOPATH/lib/src/lib.c
+if [ "$dozig" == "true" ]; then
+  mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Linux/x86_64
+  mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64
+  mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64
+  mkdir -p $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/arm64
+  ZIGFILES=$REPOPATH/lib/src/lib.c
 
-zig cc -g0 -O2 -shared -target x86_64-linux-gnu -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Linux/x86_64/libtree-sitter.so $ZIGFILES
-zig cc -g0 -O2 -shared -target x86_64-windows -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter.dll $ZIGFILES
-rm $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/*.pdb
-rm $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/*.lib
-zig cc -g0 -O2 -shared -target x86_64-macos -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter.jnilib $ZIGFILES
-zig cc -g0 -O2 -shared -target aarch64-macos -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/arm64/libtree-sitter.jnilib $ZIGFILES
+  zig cc -g0 -O2 -shared -target x86_64-linux-gnu -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Linux/x86_64/libtree-sitter.so $ZIGFILES
+  zig cc -g0 -O2 -shared -target x86_64-windows -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter.dll $ZIGFILES
+  rm $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/*.pdb
+  rm $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/*.lib
+  zig cc -g0 -O2 -shared -target x86_64-macos -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/x86_64/libtree-sitter.jnilib $ZIGFILES
+  zig cc -g0 -O2 -shared -target aarch64-macos -std=c11 -I $REPOPATH/lib/include -I $REPOPATH/lib/src -o $TARGETMODULEPATH/src/main/resources/org/springframework/shell/treesitter/Mac/arm64/libtree-sitter.jnilib $ZIGFILES
+fi
diff --git a/...er/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter.dll b/...er/src/main/resources/org/springframework/shell/treesitter/Windows/x86_64/tree-sitter.dll