Replace lib:/// scheme by mvn:/// and file:/// and jar+file:/// everywhere

META-INF/RASCAL.MF

@@ -1,5 +1,2 @@
 Project-Name: rascal
-Source: src/org/rascalmpl/library,src/org/rascalmpl/tutor,test/org/rascalmpl/benchmark,test/org/rascalmpl/test/data
-Courses: src/org/rascalmpl/courses
-
-
+Source: src/org/rascalmpl/library,src/org/rascalmpl/compiler,src/org/rascalmpl/library,src/org/rascalmpl/tutor,test/org/rascalmpl/benchmark,test/org/rascalmpl/test/data

pom.xml

@@ -28,7 +28,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lucence-version>7.5.0</lucence-version>
         <maven-version>3.9.9</maven-version>
         <exec.mainClass>org.rascalmpl.shell.RascalShell</exec.mainClass>
         <rascal.test.memory>3</rascal.test.memory>
@@ -137,7 +136,10 @@
                     <bin>${project.build.outputDirectory}</bin>
                     <srcs>
                         <src>${project.basedir}/src/org/rascalmpl/library</src>
+                        <!-- do not typecheck the checker or the tutor yet 
                         <src>${project.basedir}/src/org/rascalmpl/tutor</src>
+                        <src>${project.basedir}/src/org/rascalmpl/compiler</src>
+                        -->
                     </srcs>
                     <sourceLookup>|std:///|</sourceLookup>
                     <funding>${project.basedir}/FUNDING</funding>
@@ -172,7 +174,8 @@
                             <goal>package</goal>
                         </goals>
                     </execution>
-		    <!--
+
+		    <!-- commented out while bootstrapping the tutor
                     <execution>
                         <id>default-cli</id>
                         <phase>compile</phase>
@@ -416,6 +419,13 @@
             <artifactId>rascal-p2-dependencies-repackaged</artifactId>
             <version>0.6.0</version>
         </dependency>
+        <!-- Bootstrap dependency on typepal -->
+        <dependency>
+            <groupId>org.rascalmpl</groupId>
+            <artifactId>typepal</artifactId>
+            <version>0.15.1</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Regular POM Dependencies -->
         <dependency>
@@ -575,7 +585,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-        </profile>
     </profiles>
 </project>

src/org/rascalmpl/compiler/Compiler.rsc

@@ -0,0 +1,6 @@
+module Compiler
+
+import analysis::typepal::TypePal;
+
+// TODO: This is intended to be a temporary placeholder module (useful for
+// testing `PathConfig` changes). It should be removed after the merge.

src/org/rascalmpl/interpreter/Evaluator.java

@@ -37,7 +37,6 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedMap;
-import java.util.SortedSet;
 import java.util.Stack;
 import java.util.TreeMap;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -264,10 +263,10 @@
         updateProperties();
 
         if (stderr == null) {
-            throw new NullPointerException();
+            throw new NullPointerException("stderr is null");
         }
         if (stdout == null) {
-            throw new NullPointerException();
+            throw new NullPointerException("stdout is null");
         }
 
         // default event trigger to swallow events
@@ -1149,6 +1148,7 @@
      * @param string
      */
     public void doImport(IRascalMonitor monitor, String... string) {
+        assert monitor != null;
         IRascalMonitor old = setMonitor(monitor);
         interrupt = false;
         try {

src/org/rascalmpl/interpreter/IEvaluatorContext.java

@@ -19,7 +19,6 @@
 
 import java.io.PrintWriter;
 import java.io.Reader;
-import java.util.Collection;
 import java.util.Map;
 import java.util.Stack;
 

src/org/rascalmpl/interpreter/utils/RascalManifest.java

@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -18,7 +17,6 @@
 import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
-import org.rascalmpl.library.util.PathConfig;
 import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.uri.URIUtil;
 import org.rascalmpl.uri.jar.JarURIResolver;
@@ -41,12 +39,11 @@
     protected static final String SOURCE = "Source";
     protected static final String META_INF = "META-INF";
     public static final String META_INF_RASCAL_MF = META_INF + "/RASCAL.MF";
+    public static final String META_INF_MANIFEST_MF = META_INF + "/MANIFEST.MF";
     protected static final String MAIN_MODULE = "Main-Module";
     protected static final String MAIN_FUNCTION = "Main-Function";
     protected static final String PROJECT_NAME = "Project-Name";
-    protected static final String REQUIRE_BUNDLES = "Require-Bundles";
-    protected static final String REQUIRE_LIBRARIES = "Require-Libraries";
-
+
     public static String getRascalVersionNumber() {
         try {
             Enumeration<URL> resources = RascalManifest.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
@@ -61,11 +58,28 @@
                 }
             }
 
-            return "Rascal version not specified in META-INF/MANIFEST.MF???";
+            return "Not specified";
         } catch (IOException e) {
             return "unknown (due to " + e.getMessage();
         }
     }
+
+    /**
+     * This looks into the META-INF/MANIFEST.MF file for a Name and Specification-Version
+     */
+    public String getManifestVersionNumber(ISourceLocation project) throws IOException {
+        Manifest mf = new Manifest(javaManifest(project));
+
+        String bundleName = mf.getMainAttributes().getValue("Name");
+        if (bundleName != null && bundleName.equals("rascal")) {
+            String result = mf.getMainAttributes().getValue("Specification-Version");
+            if (result != null) {
+                return result;
+            }
+        }
+
+        return "unknown";
+    }
 
     public Manifest getDefaultManifest(String projectName) {
         Manifest manifest = new Manifest();
@@ -75,7 +89,6 @@
         mainAttributes.put(new Attributes.Name(MAIN_MODULE), DEFAULT_MAIN_MODULE);
         mainAttributes.put(new Attributes.Name(MAIN_FUNCTION), DEFAULT_MAIN_FUNCTION);
         mainAttributes.put(new Attributes.Name(PROJECT_NAME), projectName);
-        mainAttributes.put(new Attributes.Name(REQUIRE_LIBRARIES), "");
         return manifest;
     }
 
@@ -152,13 +165,6 @@
         return getManifestProjectName(manifest(jarFile));
     }
 
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getRequiredLibraries(JarInputStream jarStream) {
-        return getManifestRequiredLibraries(manifest(jarStream));
-    }
-
     /**
      * @return the name of the main module of a deployment unit, or 'null' if none is configured.
      */
@@ -195,20 +201,6 @@
         return getManifestMainModule(manifest(clazz)) != null;
     }  
 
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getRequiredLibraries(File jarFile) {
-        return getManifestRequiredLibraries(manifest(jarFile));
-    }
-
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getRequiredLibraries(Class<?> clazz) {
-        return getManifestRequiredLibraries(manifest(clazz));
-    }
-
     /**
      * @return a list of paths relative to the root of the jar, if no such option is configured
      *         it will return ["src"].
@@ -238,17 +230,6 @@
     public String getManifestMainFunction(InputStream project) {
         return getManifestAttribute(project, MAIN_FUNCTION, null);
     }
-
-    /**
-     * @return a list of bundle names this jar depends on, or 'null' if none is configured.
-     */
-    public List<String> getManifestRequiredLibraries(InputStream project) {
-        return getManifestAttributeList(project, REQUIRE_LIBRARIES, null);
-    }
-
-    public List<String> getManifestRequiredLibraries(ISourceLocation root) {
-        return getManifestAttributeList(manifest(root), REQUIRE_LIBRARIES, null);
-    }
 
     public InputStream manifest(Class<?> clazz) {
         return clazz.getResourceAsStream("/" + META_INF_RASCAL_MF);
@@ -262,6 +243,14 @@
         }
     }
 
+    public InputStream javaManifest(ISourceLocation root) {
+        try {
+            return URIResolverRegistry.getInstance().getInputStream(URIUtil.getChildLocation(JarURIResolver.jarify(root), META_INF_MANIFEST_MF));
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
     public String getProjectName(ISourceLocation root) {
         return getManifestProjectName(manifest(root));
     }
@@ -270,25 +259,6 @@
         return getManifestSourceRoots(manifest(root));
     }
 
-    public List<String> getRequiredLibraries(ISourceLocation root) {
-        return getManifestRequiredLibraries(manifest(root));
-    }
-
-    public PathConfig makePathConfig(ISourceLocation root) throws IOException {
-        List<ISourceLocation> libs = new ArrayList<>();
-        List<ISourceLocation> srcs = new ArrayList<>();
-
-        ISourceLocation binFolder = URIUtil.getChildLocation(root, "bin");
-        libs.add(binFolder);
-
-        RascalManifest mf = new RascalManifest();
-        for (String src : mf.getSourceRoots(root)) {
-            srcs.add(URIUtil.getChildLocation(root, src));
-        }
-
-        return new PathConfig(srcs, libs, binFolder);
-    }
-
     public InputStream manifest(JarInputStream stream) {
         JarEntry next = null;
         ByteArrayOutputStream out = new ByteArrayOutputStream();

src/org/rascalmpl/library/Location.rsc

@@ -45,6 +45,14 @@ loc relativize(list[loc] haystack, loc needle) {
     }
 }
 
+@synopsis{Shortens an absolute path to a jar inside the local maven repository.}
+@javaClass{org.rascalmpl.library.Prelude}
+java loc mavenize(loc jar);
+
+@synopsis{If the location points to a jar file, then this modifies the scheme and the path to point _inside_ of the jar.}
+@javaClass{org.rascalmpl.library.Prelude}
+java loc jarify(loc jar);
+
 @synopsis{Convert Windows path syntax to a `loc` value}
 @description{
 This conversion supports generic Windows path syntax, including: