# HG changeset patch
# User wenzelm
# Date 1625081437 -7200
# Node ID 8cc8911834844c6dc6c761f590368e27b7b47bcd
# Parent  f627ffab387b6fcddf211504e8d4ce503cdfad5d
clarified Isabelle/Java/Scala project setup;

diff -r f627ffab387b -r 8cc891183484 src/Pure/Tools/scala_project.scala
--- a/src/Pure/Tools/scala_project.scala	Wed Jun 30 20:57:38 2021 +0200
+++ b/src/Pure/Tools/scala_project.scala	Wed Jun 30 21:30:37 2021 +0200
@@ -111,12 +111,18 @@
     if (project_dir.is_file || project_dir.is_dir)
       error("Project directory already exists: " + project_dir)
 
-    val src_dir = project_dir + Path.explode("src/main/scala")
     val java_src_dir = project_dir + Path.explode("src/main/java")
     val scala_src_dir = Isabelle_System.make_directory(project_dir + Path.explode("src/main/scala"))
 
     Isabelle_System.copy_dir(Path.explode("~~/src/Tools/jEdit/dist/jEdit"), java_src_dir)
 
+    if (symlinks) {
+      Isabelle_System.symlink(Path.explode("~~/src/Tools/Setup/src/isabelle"), java_src_dir)
+    }
+    else {
+      Isabelle_System.copy_dir(Path.explode("~~/src/Tools/Setup/src"), java_src_dir)
+    }
+
     val files = isabelle_files
     isabelle_scala_files
 
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/.name
--- a/src/Tools/Setup/.idea/.name	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-isabelle-setup
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/artifacts/Setup_jar.xml
--- a/src/Tools/Setup/.idea/artifacts/Setup_jar.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="Setup:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
-    <root id="archive" name="Setup.jar">
-      <element id="module-output" name="Setup" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/codeStyles/Project.xml
--- a/src/Tools/Setup/.idea/codeStyles/Project.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="SOFT_MARGINS" value="100" />
-    <codeStyleSettings language="Scala">
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/codeStyles/codeStyleConfig.xml
--- a/src/Tools/Setup/.idea/codeStyles/codeStyleConfig.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/misc.xml
--- a/src/Tools/Setup/.idea/misc.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/modules.xml
--- a/src/Tools/Setup/.idea/modules.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Setup.iml" filepath="$PROJECT_DIR$/Setup.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/sbt.xml
--- a/src/Tools/Setup/.idea/sbt.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ScalaSbtSettings">
-    <option name="customVMPath" />
-  </component>
-</project>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/vcs.xml
--- a/src/Tools/Setup/.idea/vcs.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="hg4idea" />
-  </component>
-</project>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/.idea/workspace.xml
--- a/src/Tools/Setup/.idea/workspace.xml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ArtifactsWorkspaceSettings">
-    <artifacts-to-build>
-      <artifact name="Setup:jar" />
-    </artifacts-to-build>
-  </component>
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="a00f79eb-e202-4706-95b3-a972b05b3ddb" name="Default Changelist" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CodeStyleSettingsInfer">
-    <option name="done" value="true" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectCodeStyleSettingsMigration">
-    <option name="version" value="1" />
-  </component>
-  <component name="ProjectId" id="1sP6lEsakYWhAQI9WzuHpAcovaN" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.18055555" />
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="a00f79eb-e202-4706-95b3-a972b05b3ddb" name="Default Changelist" comment="" />
-      <created>1620762028428</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1620762028428</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="hg4idea.settings">
-    <option name="CHECK_INCOMING_OUTGOING" value="true" />
-    <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
-  </component>
-</project>
\ No newline at end of file
diff -r f627ffab387b -r 8cc891183484 src/Tools/Setup/Setup.iml
--- a/src/Tools/Setup/Setup.iml	Wed Jun 30 20:57:38 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file