Skip to content

Commit

Permalink
Balthisar Tidy and Pro version 4.1.1:
Browse files Browse the repository at this point in the history
- Update project to newest Xcode.
- Help project updated with newer Gems that don't have security
  vulnerabilities.
- Help project updated to fix broken search functionality.
- Tidy updated to 5.7.28.
- Nu HTML Checker updated to 19.9.8.
- Updated the JRE to the OpenJDK, version 12.0.2.
- Tweaked a Tidy description just a bit to ensure proper fit.
- Build system automatically manages Java executable plist and entitlements.
- README updates.
  • Loading branch information
balthisar committed Sep 11, 2019
1 parent cbc98fa commit 86d403b
Show file tree
Hide file tree
Showing 188 changed files with 2,047 additions and 1,201 deletions.
2 changes: 1 addition & 1 deletion Balthisar Tidy Help Project/Contents/Info.plist.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleName</key>
<string><%= cfBundleName %></string>
<key>HPDBookAccessPath</key>
<string>index.html</string>
<string>index_hpd.html</string>
<key>HPDBookIndexPath</key>
<string><%= cfBundleName %>.helpindex</string>
<key>HPDBookTitle</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
!!!
%html{:lang => "#{current_page.hb_locale}"}
%head
:javascript
window.location.href = "./index.html";
%meta{:charset => 'UTF-8'}
%meta{:name => 'robots', :content => 'noindex'}
%meta{:'http-equiv' => 'refresh', :content => "0;url=./index.html" }
%title= current_page.data.title || "#{product_name} Help"
%body

-#
This layout should be used for pages with no content, such as the index.html
pages used as group metadata containers.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: HPD redirector
layout: layout-hpd
---
2 changes: 1 addition & 1 deletion Balthisar Tidy Help Project/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ source 'https://rubygems.org'
#######################################
# Middlemac, natch.
#######################################
gem 'middlemac', '~> 3.0.0'
gem 'middlemac', '~> 3.0.1'
gem 'middleman-targets', '~> 1.0.12'


Expand Down
54 changes: 27 additions & 27 deletions Balthisar Tidy Help Project/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.0.7)
activesupport (5.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
backports (3.11.4)
chunky_png (1.3.10)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
backports (3.15.0)
chunky_png (1.3.11)
coffee-script (2.4.1)
coffee-script-source
execjs
Expand All @@ -26,9 +26,9 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
contracts (0.13.0)
dotenv (2.5.0)
dotenv (2.7.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
Expand All @@ -37,9 +37,9 @@ GEM
execjs (2.7.0)
fast_blank (1.0.0)
fast_trie (0.5.1)
fastimage (2.1.4)
ffi (1.9.25)
haml (5.0.4)
fastimage (2.1.7)
ffi (1.11.1)
haml (5.1.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
Expand All @@ -52,7 +52,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
memoist (0.16.0)
middlemac (3.0.0)
middlemac (3.0.1)
fast_trie
middleman-cli (~> 4.2.0, >= 4.2.0)
middleman-core (~> 4.2.0, >= 4.2.0)
Expand Down Expand Up @@ -99,38 +99,38 @@ GEM
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-syntax (3.0.0)
middleman-syntax (3.2.0)
middleman-core (>= 3.2)
rouge (~> 2.0)
middleman-targets (1.0.12)
rouge (~> 3.2)
middleman-targets (1.0.13)
middleman-cli (~> 4.1, >= 4.1.7)
middleman-core (~> 4.1, >= 4.1.7)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
multi_json (1.13.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
padrino-helpers (0.13.3.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.3.4)
tilt (>= 1.4.1, < 3)
padrino-support (0.13.3.4)
activesupport (>= 3.1)
parallel (1.12.1)
public_suffix (3.0.3)
rack (2.0.5)
parallel (1.17.0)
public_suffix (4.0.1)
rack (2.0.7)
rack-livereload (0.3.17)
rack
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (2.2.1)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (3.10.0)
sass (3.4.25)
servolux (0.13.0)
temple (0.8.0)
thor (0.20.0)
temple (0.8.1)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.9)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (3.2.0)
Expand All @@ -141,7 +141,7 @@ PLATFORMS
ruby

DEPENDENCIES
middlemac (~> 3.0.0)
middlemac (~> 3.0.1)
middleman (~> 4.2.0)
middleman-cli
middleman-compass
Expand Down
2 changes: 1 addition & 1 deletion Balthisar Tidy Help Project/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# that the build system sets for us. You’ll have to set up Xcode to
# set this environment variable, of course.
##########################################################################
version_app = ENV.has_key?('TIDY_CFBundleShortVersionString') ? ENV['TIDY_CFBundleShortVersionString'] : '4.1.0'
version_app = ENV.has_key?('TIDY_CFBundleShortVersionString') ? ENV['TIDY_CFBundleShortVersionString'] : '4.1.1'


##########################################################################
Expand Down
36 changes: 32 additions & 4 deletions Balthisar Tidy.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
D0B9F10419585474008864D6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B9F10319585474008864D6 /* QuartzCore.framework */; };
D0BA081C2103CDFE00B38A76 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D0BA081B2103CDFE00B38A76 /* Assets.xcassets */; };
D0BF29E11A7347580062B01A /* ActionRequestHandler.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0BF29DF1A7347580062B01A /* ActionRequestHandler.xib */; };
D0C95D5120ACC65F007F7C21 /* Java.runtime in Copy Java Runtime */ = {isa = PBXBuildFile; fileRef = D0947C422069CFE000CB306C /* Java.runtime */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
D0C95D5120ACC65F007F7C21 /* Java.runtime in Copy Java Runtime */ = {isa = PBXBuildFile; fileRef = D0947C422069CFE000CB306C /* Java.runtime */; };
D0C9C1251BD85FEA004C545A /* ActionRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D01C70C31A55850D00CC5038 /* ActionRequestHandler.m */; };
D0C9C1271BD85FEA004C545A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016A929182FD80700712C60 /* Cocoa.framework */; };
D0C9C1281BD85FEA004C545A /* JSDTidyFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00661081A579BE700F73F85 /* JSDTidyFramework.framework */; };
Expand Down Expand Up @@ -1522,6 +1522,7 @@
D09479F22069320100CB306C /* Headers */,
D09479F32069320100CB306C /* Resources */,
D0C95D5020ACC645007F7C21 /* Copy Java Runtime */,
D0A51FF02327CE7700340167 /* Prepare Java and Entitlements */,
D0947B9D2069CF2E00CB306C /* Copy Java Resources */,
);
buildRules = (
Expand Down Expand Up @@ -1592,7 +1593,7 @@
D016A91E182FD80700712C60 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1000;
LastUpgradeCheck = 1030;
ORGANIZATIONNAME = "Jim Derry";
TargetAttributes = {
D00661071A579BE700F73F85 = {
Expand All @@ -1607,6 +1608,9 @@
com.apple.ApplicationGroups.Mac = {
enabled = 1;
};
com.apple.HardenedRuntime = {
enabled = 1;
};
com.apple.Sandbox = {
enabled = 1;
};
Expand Down Expand Up @@ -1658,7 +1662,7 @@
};
buildConfigurationList = D016A921182FD80700712C60 /* Build configuration list for PBXProject "Balthisar Tidy" */;
compatibilityVersion = "Xcode 8.0";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -1806,7 +1810,25 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "echo \"Processing the JAR and JRE files to build a dynamic header.\"\nHEADER=\"${SRCROOT}/JSDNuVFramework/xcode-version.h\"\nJAR=\"${SRCROOT}/JSDNuVFramework/Java/vnu.jar\"\nJRE=\"${SRCROOT}/JSDNuVFramework/PlugIns/Java.runtime/Contents/Home/bin/java\"\ncd ${SRCROOT}\necho \"// This file is generated automatically. Do not edit. Data is gathered from the JAR and JRE.\" > $HEADER\necho \"// The JSDNuVFramework target Build Phases has produced this file. Make sure you\" >> $HEADER\necho \"// include this file as a JSDNuVFrame target header.\" >> $HEADER\n\nJAR_VERSION=$(java -jar ${JAR} --version)\n\n# This won't actually work if we've already code-signed the EXE.\n# The EXE will work as an NSTask, but not from here.\n#JRE_VERSION=$(${JRE} --version | head -n 1)\nJRE_VERSION=\"java 10.0.2 2018-07-17\"\n\ncat << EOF >> $HEADER\n#ifdef JAR_VERSION\n# undef JAR_VERSION\n#endif\n#ifdef JRE_VERSION\n# undef JRE_VERSION\n#endif\nEOF\n\necho \"#define JAR_VERSION @\\\"${JAR_VERSION}\\\"\" >> $HEADER\necho \"#define JRE_VERSION @\\\"${JRE_VERSION}\\\"\" >> $HEADER\n";
shellScript = "echo \"Processing the JAR and JRE files to build a dynamic header.\"\nHEADER=\"${SRCROOT}/JSDNuVFramework/xcode-version.h\"\nJAR=\"${SRCROOT}/JSDNuVFramework/Java/vnu.jar\"\nJRE=\"${SRCROOT}/JSDNuVFramework/PlugIns/Java.runtime/Contents/Home/bin/java\"\ncd ${SRCROOT}\necho \"// This file is generated automatically. Do not edit. Data is gathered from the JAR and JRE.\" > $HEADER\necho \"// The JSDNuVFramework target Build Phases has produced this file. Make sure you\" >> $HEADER\necho \"// include this file as a JSDNuVFrame target header.\" >> $HEADER\necho \"// This file built on $(date).\" >> $HEADER\n\nJAR_VERSION=$(${JRE} -jar ${JAR} --version)\n\n# This won't actually work if we've already code-signed the EXE.\n# The EXE will work as an NSTask, but not from here.\nJRE_VERSION=$(${JRE} --version | head -n 1)\n#JRE_VERSION=\"java 10.0.2 2018-07-17\"\n\ncat << EOF >> $HEADER\n#ifdef JAR_VERSION\n# undef JAR_VERSION\n#endif\n#ifdef JRE_VERSION\n# undef JRE_VERSION\n#endif\nEOF\n\necho \"#define JAR_VERSION @\\\"${JAR_VERSION}\\\"\" >> $HEADER\necho \"#define JRE_VERSION @\\\"${JRE_VERSION}\\\"\" >> $HEADER\n";
};
D0A51FF02327CE7700340167 /* Prepare Java and Entitlements */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Prepare Java and Entitlements";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "echo \"------------------------------------\"\necho \"Creating Unique Java Executables:\"\n\nP_PLUGINS=\"${BUILT_PRODUCTS_DIR}/${PLUGINS_FOLDER_PATH}\"\nP_JAVABIN=\"Java.runtime/Contents/Home/bin\"\nP_JAVALIB=\"Java.runtime/Contents/Home/lib\"\nP_TARGET=\"${P_PLUGINS}/${P_JAVABIN}\"\n\nF_JDK=\"${P_TARGET}/java\"\nF_APP=\"${P_TARGET}/javaapp\"\nF_PRO=\"${P_TARGET}/javapro\"\nF_WEB=\"${P_TARGET}/javaweb\"\n\nF_JSH=\"${P_PLUGINS}/${P_JAVALIB}/jspawnhelper\"\n\necho \"Working in ${P_TARGET}\"\n\n# This is a binary file, so replacement must be exact length.\nS_JDK=\"net.java.openjdk.cmd\"\nS_APP=\"com.balthisar.jdkapp\"\nS_PRO=\"com.balthisar.jdkpro\"\nS_WEB=\"com.balthisar.jdkweb\"\n\n# Convert them to hex representation.\nSO=\"<string>\"\nSC=\"</string>\"\n\nSN_JDK=\"$(printf ${SO}${S_JDK}${SC} | xxd -g 0 -u -ps -c 256)\"\nSN_APP=\"$(printf ${SO}${S_APP}${SC} | xxd -g 0 -u -ps -c 256)\"\nSN_PRO=\"$(printf ${SO}${S_PRO}${SC} | xxd -g 0 -u -ps -c 256)\"\nSN_WEB=\"$(printf ${SO}${S_WEB}${SC} | xxd -g 0 -u -ps -c 256)\"\n\nhexdump -ve '1/1 \"%.2X\"' ${F_JDK} | sed \"s/${SN_JDK}/${SN_APP}/g\" | xxd -r -p > ${F_APP}\nhexdump -ve '1/1 \"%.2X\"' ${F_JDK} | sed \"s/${SN_JDK}/${SN_PRO}/g\" | xxd -r -p > ${F_PRO}\nhexdump -ve '1/1 \"%.2X\"' ${F_JDK} | sed \"s/${SN_JDK}/${SN_WEB}/g\" | xxd -r -p > ${F_WEB}\n\nrm \"${F_JDK}\"\nchmod +x \"${F_APP}\"\nchmod +x \"${F_PRO}\"\nchmod +x \"${F_WEB}\"\n\necho \"------------------------------------\"\necho \"Applying Entitlements:\"\n\nF_ENTITLEMENTS=\"${SRCROOT}/JSDNuVFramework/PlugIns/java.entitlements\"\n\necho \"Using the entitlements file: ${F_ENTITLEMENTS}\"\necho \"Using the Signing Identity: ${EXPANDED_CODE_SIGN_IDENTITY_NAME}\"\n\ncodesign -f -s \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" --entitlements \"${F_ENTITLEMENTS}\" \"${F_APP}\"\ncodesign -f -s \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" --entitlements \"${F_ENTITLEMENTS}\" \"${F_PRO}\"\ncodesign -f -s \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" --entitlements \"${F_ENTITLEMENTS}\" \"${F_WEB}\"\ncodesign -f -s \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" --entitlements \"${F_ENTITLEMENTS}\" \"${F_JSH}\"\n\necho \"------------------------------------\"\n";
};
D0F4A50E1BDA2C970051327D /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -2367,13 +2389,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
buildSettings = {
ENABLE_HARDENED_RUNTIME = YES;
};
name = app_debug;
};
D016A95C182FD80700712C60 /* app_release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
buildSettings = {
ENABLE_HARDENED_RUNTIME = YES;
};
name = app_release;
};
Expand Down Expand Up @@ -2402,6 +2426,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
buildSettings = {
ENABLE_HARDENED_RUNTIME = YES;
};
name = web_debug;
};
Expand Down Expand Up @@ -2458,6 +2483,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
buildSettings = {
ENABLE_HARDENED_RUNTIME = YES;
};
name = pro_debug;
};
Expand Down Expand Up @@ -2514,6 +2540,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
buildSettings = {
ENABLE_HARDENED_RUNTIME = YES;
};
name = pro_release;
};
Expand Down Expand Up @@ -2570,6 +2597,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = D036D6431FB3927D00916128 /* balthisar-tidy.xcconfig */;
buildSettings = {
ENABLE_HARDENED_RUNTIME = YES;
};
name = web_release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1000"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit 86d403b

Please sign in to comment.