Skip to content

Commit c46116b

Browse files
committedOct 30, 2023
[Java] Give up on javadoc entirely as we just cannot require HTML
1 parent 2df822c commit c46116b

File tree

2 files changed

+2
-24
lines changed

2 files changed

+2
-24
lines changed
 

‎.github/workflows/build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,11 @@ jobs:
265265
cp ldk-java.jar ldk-java-bins/new/
266266
cp ldk-java-leaktracking.jar ldk-java-bins/new/
267267
cp ldk-java-classes.jar ldk-java-bins/new/
268-
cp ldk-java-javadoc.jar ldk-java-bins/new/
269268
cd ldk-java-bins
270269
rm "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/liblightningjs.wasm" # TODO: Test this
271270
if ! diff -r "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" new/; then
272271
apt-get -y install diffoscope
273272
diffoscope new/ldk-java-sources.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-sources.jar" || echo
274-
diffoscope new/ldk-java-javadoc.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-javadoc.jar" || echo
275273
diffoscope new/ldk-java-classes.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-classes.jar" || echo
276274
diffoscope new/ldk-java.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java.jar" || echo
277275
diffoscope new/ldk-java-leaktracking.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-leaktracking.jar" || echo

‎build-release-jar.sh

+2-22
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ ls src/main/resources/liblightningjni_MacOSX-aarch64.nativelib
1212
export LC_ALL=C
1313

1414
# We need to fetch dependencies first as faketime will break PKI cert checks!
15-
mvn -DskipTests=true -Dorg.lightningdevkit.skipdocs=false package
15+
mvn -DskipTests=true package
1616
mvn clean
17-
faketime 2021-01-01 mvn -DskipTests=true -Dorg.lightningdevkit.skipdocs=false package
17+
faketime 2021-01-01 mvn -DskipTests=true package
1818

1919
mkdir ziptmp
2020
cd ziptmp
@@ -26,26 +26,6 @@ rm ../target/ldk-java-*-sources.jar
2626
cd ..
2727
rm -r ziptmp
2828

29-
mkdir ziptmp
30-
cd ziptmp
31-
unzip ../target/ldk-java-*-javadoc.jar | grep inflating | awk '{ print $2 }' | sort > ../javadoc-zip-files.txt
32-
find . | grep '.html$' | xargs -L1 sed -i 's/Generated by javadoc \(.*\) on Fri Jan 01 .* UTC 2021/Generated by javadoc \1 on Fri Jan 01 00:00:00 UTC 2021/g'
33-
for ZIP in *.zip; do
34-
mkdir ziptmptmp
35-
cd ziptmptmp
36-
unzip ../$ZIP | grep inflating | awk '{ print $2 }' | sort > ../../javadoc-zip-zip-files.txt
37-
rm ../$ZIP
38-
touch -d "2021-01-01 00:00 UTC" $(cat ../../javadoc-zip-zip-files.txt)
39-
cat ../../javadoc-zip-zip-files.txt | zip -X@ ../$ZIP
40-
cd ..
41-
rm -r ziptmptmp
42-
done
43-
touch -d "2021-01-01 00:00 UTC" $(cat ../javadoc-zip-files.txt)
44-
cat ../javadoc-zip-files.txt | grep -v nativelib | zip -X@ ../ldk-java-javadoc.jar
45-
rm ../target/ldk-java-*-javadoc.jar
46-
cd ..
47-
rm -r ziptmp
48-
4929
mkdir ziptmp
5030
cd ziptmp
5131
unzip ../target/ldk-java-*.jar | grep inflating | awk '{ print $2 }' | sort > ../classes-zip-files.txt

0 commit comments

Comments
 (0)