Skip to content

Commit

Permalink
8297165: Update Pandoc to version 2.19.2 for Oracle builds
Browse files Browse the repository at this point in the history
Reviewed-by: erikj
  • Loading branch information
vidmik committed Nov 17, 2022
1 parent 8b140e2 commit 9c432a0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 21 deletions.
13 changes: 1 addition & 12 deletions make/conf/jib-profiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -1078,17 +1078,6 @@ var getJibProfilesDependencies = function (input, common) {
environment_path: common.boot_jdk_home + "/bin"
}

var pandoc_version;
if (input.build_cpu == "aarch64") {
if (input.build_os == "macosx") {
pandoc_version = "2.14.0.2+1.0";
} else {
pandoc_version = "2.5+1.0";
}
} else {
pandoc_version = "2.3.1+1.0";
}

var makeRevision = "4.0+1.0";
var makeBinSubDir = "/bin";
var makeModule = "gnumake-" + input.build_platform;
Expand Down Expand Up @@ -1202,7 +1191,7 @@ var getJibProfilesDependencies = function (input, common) {
pandoc: {
organization: common.organization,
ext: "tar.gz",
revision: pandoc_version,
revision: "2.19.2+1.0",
module: "pandoc-" + input.build_platform,
configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc",
environment_path: input.get("pandoc", "install_path") + "/pandoc"
Expand Down
24 changes: 15 additions & 9 deletions make/devkit/createPandocBundle.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e
#
# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -31,19 +31,29 @@ trap "rm -rf \"$TMPDIR\"" EXIT

ORIG_DIR=`pwd`
cd "$TMPDIR"
PANDOC_VERSION=2.3.1
PANDOC_VERSION=2.19.2
PACKAGE_VERSION=1.0
TARGET_PLATFORM=linux_x64
if [ $# = 1 ]; then
TARGET_PLATFORM="$1"
fi

PANDOC_EXE="pandoc"
PANDOC_PATH="bin/$PANDOC_EXE"
if [[ $TARGET_PLATFORM == linux_x64 ]] ; then
PANDOC_PLATFORM=linux
PANDOC_PLATFORM=linux-amd64
PANDOC_SUFFIX=tar.gz
elif [[ $TARGET_PLATFORM == linux_aarch64 ]] ; then
PANDOC_PLATFORM=linux-arm64
PANDOC_SUFFIX=tar.gz
elif [[ $TARGET_PLATFORM == macosx_x64 ]] ; then
PANDOC_PLATFORM=macOS
PANDOC_SUFFIX=zip
elif [[ $TARGET_PLATFORM == windows_x64 ]] ; then
PANDOC_PLATFORM=windows-x86_64
PANDOC_SUFFIX=zip
PANDOC_EXE="pandoc.exe"
PANDOC_PATH="$PANDOC_EXE"
else
echo "Unknown platform"
exit 1
Expand All @@ -62,12 +72,8 @@ fi
cd ..

mkdir pandoc
if [[ $TARGET_PLATFORM == windows_x64 ]] ; then
cp tmp/pandoc-$PANDOC_VERSION-$PANDOC_PLATFORM/pandoc.exe pandoc
chmod +x pandoc/pandoc.exe
else
cp tmp/pandoc-$PANDOC_VERSION/bin/pandoc pandoc
fi
cp tmp/pandoc-$PANDOC_VERSION/$PANDOC_PATH pandoc
chmod +x pandoc/$PANDOC_EXE

tar -cvzf ../$BUNDLE_NAME pandoc
cp ../$BUNDLE_NAME "$ORIG_DIR"

1 comment on commit 9c432a0

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.