From e8ccfa69488b95dff0ffe1df4f500846696fce3c Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 7 Oct 2024 13:23:35 +0200 Subject: [PATCH] Fixing markup lint --- tooling/reproducible/ReproducibleBuilds.md | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tooling/reproducible/ReproducibleBuilds.md b/tooling/reproducible/ReproducibleBuilds.md index 2009dfc02..b6fa6d1ad 100755 --- a/tooling/reproducible/ReproducibleBuilds.md +++ b/tooling/reproducible/ReproducibleBuilds.md @@ -71,7 +71,7 @@ before the comparable_patch.sh can be run. 3. Compile [src/java/temurin/tools/BinRepl.java](https://github.com/adoptium/temurin-build/blob/master/tooling/src/java/temurin/tools/BinRepl.java) : - Ensure suitable JDK on PATH - - **do not ** use JDK you are just patching, the JDK is **broken** after (also during) of patching + - **do not** use JDK you are just patching, the JDK is **broken** after (also during) of patching - cd tooling/src/java - javac temurin/tools/BinRepl.java @@ -84,8 +84,10 @@ before the comparable_patch.sh can be run. - A JDK for running BinRepl java : export PATH=/bin:$PATH ##### Cygwin treacherousness - - it is extremly difficult (maybe impossible) to invoke `vcvarsall.bat+cl` in cygwin directly - - thus it is recomeded to launch this via `cmd -c` or better by executable .bat file: + +- it is extremly difficult (maybe impossible) to invoke `vcvarsall.bat+cl` in cygwin directly +- thus it is recomeded to launch this via `cmd -c` or better by executable .bat file: + ``` pushd "$MSVSC/BUILD/TOOLS" echo " @@ -98,15 +100,20 @@ before the comparable_patch.sh can be run. mv WindowsUpdateVsVersionInfo.exe "$some/location/on/future/path" popd ``` - - the default paths should work fine, but are quite hidden eg: + +- the default paths should work fine, but are quite hidden eg: + ``` MSBASE_PATH="/cygdrive/c/Program Files/Microsoft Visual Studio/" MSVSC=$(find "$MSBASE_PATH" -type d | grep Hostx64/x64$ | head -n 1 ) WINKIT=$(dirname "$(find '/cygdrive/c/Program Files (x86)/Windows Kits' | grep x64/signtool.exe$ | head -n 1)") MSVSCBUILDTOOLS=$(find "$MSBASE_PATH" -type d | grep Auxiliary/Build$ | head -n 1 ) ``` - - note the cygpath usages, sometimes are necessary, sometimes not. Java *bianries* have issues with it: - - eg for javac: + +- note the cygpath usages, sometimes are necessary, sometimes not. Java *bianries* have issues with it: + - eg for $CLASSPATH, + - or javac it is mandatory: + ``` ftureDir="$(pwd)/classes" if uname | grep CYGWIN ; then @@ -114,7 +121,7 @@ before the comparable_patch.sh can be run. fi $AQA_DIR/$jdkName/bin/javac -d "${ftureDir}" "../../tooling/src/java/temurin/tools/BinRepl.java" ``` - - or $CLASSPATH it is mandatory + #### Running comparable_patch.sh: 1. Unzip your JDK archive into a directory (eg.jdk1) @@ -123,7 +130,7 @@ before the comparable_patch.sh can be run. - in cygwin, you may need to fix permissions `chmod -R 777 "${JDK_DIR}"` - otherwise future calls to java/javap/javac would fail -3. Run comparable_patch.sh +2. Run comparable_patch.sh ```bash bash comparable_patch.sh --jdk-dir "" --version-string "" --vendor-name "" --vendor_url "" --vendor-bug-url "" --vendor-vm-bug-url "" [--patch-vs-version-info]