Skip to content

Commit

Permalink
Fixing markup lint
Browse files Browse the repository at this point in the history
  • Loading branch information
judovana committed Oct 7, 2024
1 parent 12437e5 commit e8ccfa6
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions tooling/reproducible/ReproducibleBuilds.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -84,8 +84,10 @@ before the comparable_patch.sh can be run.
- A JDK for running BinRepl java : export PATH=<jdk>/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 "
Expand All @@ -98,23 +100,28 @@ 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
ftureDir=$(cygpath -m "${ftureDir}")
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)
Expand All @@ -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 "<jdk_home_dir>" --version-string "<version_str>" --vendor-name "<vendor_name>" --vendor_url "<vendor_url>" --vendor-bug-url "<vendor_bug_url>" --vendor-vm-bug-url "<vendor_vm_bug_url>" [--patch-vs-version-info]
Expand Down

0 comments on commit e8ccfa6

Please sign in to comment.