# 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 @@
-
-
- $PROJECT_DIR$/out/artifacts/
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1620762028428
-
-
- 1620762028428
-
-
-
-
-
-
-
-
\ 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 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file