standalone jps updated: load path variables specified in gant scripts

build/gant.xml

@@ -29,6 +29,7 @@
        <include name="oromatcher.jar"/>
        <include name="cli-parser-*.jar"/>
        <include name="nanoxml-*.jar"/>
+       <include name="jsr166e.jar"/>
     </fileset>
   </path>
 

jps/standalone-builder/jps-standalone-builder.iml

@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="jps-model-api" />
     <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="library" name="Ant" level="project" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="module" module-name="jps-model-serialization" exported="" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>

jps/standalone-builder/src/org/jetbrains/jps/gant/JpsGantTool.groovy

@@ -24,6 +24,7 @@ import org.jetbrains.jps.model.JpsModel
 import org.jetbrains.jps.model.JpsProject
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.jps.model.library.JpsOrderRootType
+import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
 import org.jetbrains.jps.model.serialization.JpsProjectLoader
 /**
  * @author nik
@@ -105,7 +106,8 @@ final class JpsGantTool {
   }
 
   private void loadProject(String path, JpsModel model, JpsGantProjectBuilder builder) {
-    JpsProjectLoader.loadProject(model.project, [:], path)
+    def pathVariables = JpsModelSerializationDataService.computeAllPathVariables(model.global)
+    JpsProjectLoader.loadProject(model.project, pathVariables, path)
     if (builder.getDataStorageRoot() == null) {
       builder.setDataStorageRoot(Utils.getDataStorageRoot(path))
     }