equal
deleted
inserted
replaced
24 "src/isabelle_logic.scala" |
24 "src/isabelle_logic.scala" |
25 "src/isabelle_options.scala" |
25 "src/isabelle_options.scala" |
26 "src/isabelle_sidekick.scala" |
26 "src/isabelle_sidekick.scala" |
27 "src/jedit_editor.scala" |
27 "src/jedit_editor.scala" |
28 "src/jedit_lib.scala" |
28 "src/jedit_lib.scala" |
29 "src/jedit_main.scala" |
|
30 "src/jedit_options.scala" |
29 "src/jedit_options.scala" |
31 "src/jedit_thy_load.scala" |
30 "src/jedit_thy_load.scala" |
32 "src/monitor_dockable.scala" |
31 "src/monitor_dockable.scala" |
33 "src/osx_adapter.scala" |
32 "src/osx_adapter.scala" |
34 "src/output_dockable.scala" |
33 "src/output_dockable.scala" |
211 pushd "$JEDIT_HOME" >/dev/null || failed |
210 pushd "$JEDIT_HOME" >/dev/null || failed |
212 |
211 |
213 JEDIT_JAR="$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/jedit.jar" |
212 JEDIT_JAR="$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/jedit.jar" |
214 |
213 |
215 JEDIT_JARS=( |
214 JEDIT_JARS=( |
216 "Console.jar" |
215 "$ISABELLE_JEDIT_BUILD_HOME/contrib/Console.jar" |
217 "ErrorList.jar" |
216 "$ISABELLE_JEDIT_BUILD_HOME/contrib/ErrorList.jar" |
218 "Highlight.jar" |
217 "$ISABELLE_JEDIT_BUILD_HOME/contrib/Highlight.jar" |
219 "SideKick.jar" |
218 "$ISABELLE_JEDIT_BUILD_HOME/contrib/SideKick.jar" |
220 "cobra.jar" |
219 "$ISABELLE_JEDIT_BUILD_HOME/contrib/cobra.jar" |
221 "js.jar" |
220 "$ISABELLE_JEDIT_BUILD_HOME/contrib/js.jar" |
222 "idea-icons.jar" |
221 "$ISABELLE_JEDIT_BUILD_HOME/contrib/idea-icons.jar" |
223 "jsr305-2.0.0.jar" |
222 "$ISABELLE_JEDIT_BUILD_HOME/contrib/jsr305-2.0.0.jar" |
224 ) |
223 ) |
225 |
|
226 declare -a JEDIT_BUILD_JARS=() |
|
227 declare -a JEDIT_STARTUP_JARS=() |
|
228 for NAME in "${JEDIT_JARS[@]}" |
|
229 do |
|
230 JEDIT_BUILD_JARS["${#JEDIT_BUILD_JARS[@]}"]="$ISABELLE_JEDIT_BUILD_HOME/contrib/$NAME" |
|
231 JEDIT_STARTUP_JARS["${#JEDIT_STARTUP_JARS[@]}"]="$JEDIT_HOME/dist/jars/$NAME" |
|
232 done |
|
233 |
224 |
234 declare -a JFREECHART_JARS=() |
225 declare -a JFREECHART_JARS=() |
235 for NAME in $JFREECHART_JAR_NAMES |
226 for NAME in $JFREECHART_JAR_NAMES |
236 do |
227 do |
237 JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$JFREECHART_HOME/lib/$NAME" |
228 JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$JFREECHART_HOME/lib/$NAME" |
251 if [ ! -e "$TARGET" ]; then |
242 if [ ! -e "$TARGET" ]; then |
252 OUTDATED=true |
243 OUTDATED=true |
253 else |
244 else |
254 if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then |
245 if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then |
255 declare -a DEPS=( |
246 declare -a DEPS=( |
256 "$JEDIT_JAR" "${JEDIT_BUILD_JARS[@]}" "${JFREECHART_JARS[@]}" "$XZ_JAVA_HOME/lib/xz.jar" |
247 "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}" "$XZ_JAVA_HOME/lib/xz.jar" |
257 "$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}" |
248 "$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}" |
258 ) |
249 ) |
259 elif [ -e "$ISABELLE_HOME/Admin/build" ]; then |
250 elif [ -e "$ISABELLE_HOME/Admin/build" ]; then |
260 declare -a DEPS=("$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}") |
251 declare -a DEPS=("$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}") |
261 else |
252 else |
304 print qq,<MODE NAME="isabelle-news" FILE="isabelle-news.xml"/>\n\n,; |
295 print qq,<MODE NAME="isabelle-news" FILE="isabelle-news.xml"/>\n\n,; |
305 print qq,<MODE NAME="isabelle-options" FILE="isabelle-options.xml"/>\n\n,; |
296 print qq,<MODE NAME="isabelle-options" FILE="isabelle-options.xml"/>\n\n,; |
306 print qq,<MODE NAME="isabelle-root" FILE="isabelle-root.xml" FILE_NAME_GLOB="ROOT"/>\n\n,; } |
297 print qq,<MODE NAME="isabelle-root" FILE="isabelle-root.xml" FILE_NAME_GLOB="ROOT"/>\n\n,; } |
307 print; }' dist/modes/catalog |
298 print; }' dist/modes/catalog |
308 |
299 |
309 cp -p -R -f "${JEDIT_BUILD_JARS[@]}" dist/jars/. || failed |
300 cp -p -R -f "${JEDIT_JARS[@]}" dist/jars/. || failed |
310 ( |
301 ( |
311 for JAR in "$JEDIT_JAR" "${JEDIT_BUILD_JARS[@]}" "${JFREECHART_JARS[@]}" \ |
302 for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}" \ |
312 "$XZ_JAVA_HOME/lib/xz.jar" "$PURE_JAR" "$GRAPHVIEW_JAR" "$SCALA_HOME/lib/scala-compiler.jar" |
303 "$XZ_JAVA_HOME/lib/xz.jar" "$PURE_JAR" "$GRAPHVIEW_JAR" "$SCALA_HOME/lib/scala-compiler.jar" |
313 do |
304 do |
314 CLASSPATH="$CLASSPATH:$JAR" |
305 CLASSPATH="$CLASSPATH:$JAR" |
315 done |
306 done |
316 CLASSPATH="$(jvmpath "$CLASSPATH")" |
307 CLASSPATH="$(jvmpath "$CLASSPATH")" |
333 "$ISABELLE_TOOL" build_dialog "${BUILD_DIALOG_OPTIONS[@]}" |
324 "$ISABELLE_TOOL" build_dialog "${BUILD_DIALOG_OPTIONS[@]}" |
334 RC="$?" |
325 RC="$?" |
335 [ "$RC" = 0 ] || exit "$RC" |
326 [ "$RC" = 0 ] || exit "$RC" |
336 fi |
327 fi |
337 |
328 |
338 JEDIT_CLASSPATH="$JEDIT_HOME/dist/jedit.jar" |
|
339 for JAR in "$JEDIT_HOME/dist/jars/Isabelle-jEdit.jar" "${JEDIT_STARTUP_JARS[@]}" \ |
|
340 "${JFREECHART_JARS[@]}" |
|
341 do |
|
342 JEDIT_CLASSPATH="$JEDIT_CLASSPATH:$JAR" |
|
343 done |
|
344 JEDIT_CLASSPATH="$(jvmpath "$JEDIT_CLASSPATH")" |
|
345 |
|
346 export JEDIT_SESSION_DIRS JEDIT_LOGIC JEDIT_PRINT_MODE |
329 export JEDIT_SESSION_DIRS JEDIT_LOGIC JEDIT_PRINT_MODE |
347 |
330 |
348 exec "$ISABELLE_TOOL" java "${JAVA_ARGS[@]}" \ |
331 exec "$ISABELLE_TOOL" java "${JAVA_ARGS[@]}" \ |
349 -classpath "$JEDIT_CLASSPATH" isabelle.jedit.JEdit_Main "${ARGS[@]}" |
332 -classpath "$(jvmpath "$JEDIT_HOME/dist/jedit.jar")" isabelle.Main "${ARGS[@]}" |
350 fi |
333 fi |