# HG changeset patch
# User wenzelm
# Date 1635896293 -3600
# Node ID a755733c1eb5360a8cf60d046cf7f74931d4df1e
# Parent  f1c53e78d0f0417cf4ffa733a755eca13f57a2bf
suppress sources from jEdit/test, which prevent regular build of the generated scala_project;

diff -r f1c53e78d0f0 -r a755733c1eb5 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Wed Nov 03 00:11:12 2021 +0100
+++ b/Admin/components/components.sha1	Wed Nov 03 00:38:13 2021 +0100
@@ -195,6 +195,7 @@
 33dd96cd83f2c6a26c035b7a0ee57624655224c5  jedit-20210724.tar.gz
 0e4fd4d66388ddc760fa5fbd8d4a9a3b77cf59c7  jedit-20210802.tar.gz
 258d527819583d740a3aa52dfef630eed389f8c6  jedit-20211019.tar.gz
+f4f3fcbd54488297a5d2fcd23a2595912d5ba80b  jedit-20211103.tar.gz
 44775a22f42a9d665696bfb49e53c79371c394b0  jedit_build-20111217.tar.gz
 a242a688810f2bccf24587b0062ce8027bf77fa2  jedit_build-20120304.tar.gz
 4c948dee53f74361c097c08f49a1a5ff9b17bd1d  jedit_build-20120307.tar.gz
diff -r f1c53e78d0f0 -r a755733c1eb5 Admin/components/main
--- a/Admin/components/main	Wed Nov 03 00:11:12 2021 +0100
+++ b/Admin/components/main	Wed Nov 03 00:38:13 2021 +0100
@@ -10,7 +10,7 @@
 isabelle_fonts-20211004
 isabelle_setup-20210922
 jdk-17.0.1+12
-jedit-20211019
+jedit-20211103
 jfreechart-1.5.3
 jortho-1.0-2
 kodkodi-1.5.7
diff -r f1c53e78d0f0 -r a755733c1eb5 src/Pure/Admin/build_jedit.scala
--- a/src/Pure/Admin/build_jedit.scala	Wed Nov 03 00:11:12 2021 +0100
+++ b/src/Pure/Admin/build_jedit.scala	Wed Nov 03 00:38:13 2021 +0100
@@ -161,6 +161,7 @@
       Isabelle_System.copy_dir(jedit_dir, jedit_patched_dir)
 
       val source_dir = jedit_patched_dir + Path.basic("jEdit")
+      val org_source_dir = source_dir + Path.basic("org")
       val tmp_source_dir = tmp_dir + Path.basic("jEdit")
 
       progress.echo("Patching jEdit sources ...")
@@ -187,7 +188,7 @@
 
       val java_sources =
         for {
-          file <- File.find_files(source_dir.file, file => file.getName.endsWith(".java"))
+          file <- File.find_files(org_source_dir.file, file => file.getName.endsWith(".java"))
           package_name <- Scala_Project.package_name(File.path(file))
           if !exclude_package(package_name)
         } yield File.path(component_dir.java_path.relativize(file.toPath).toFile)