on master help sign in
Reverting the change to the POM template and removing the templating/clenup logic for the Java backend.
commit14ef6f12ebed1df887e6671d335a9aebf5feff7b authorGabe McArthur <gabemc@crowdflower.com> dateWed 25 Sep 2013, 00:13 (13 years ago) parentc7cf1f0
2 files changed+6−23
Setup.hs−17 java/executable_pom_template.xml+6−6
Setup.hs−17
@@ -60,7 +60,6 @@ usesEffects flags =
6060idrisClean _ flags _ _ = do
6161 cleanStdLib
6262 cleanLLVM
63− cleanJava
6463 where
6564 verbosity = S.fromFlag $ S.cleanVerbosity flags
6665
@@ -69,10 +68,6 @@ idrisClean _ flags _ _ = do
6968 makeClean "effects"
7069 makeClean "javascript"
7170
72− cleanJava = do
73− execPomExists <- doesFileExist ("java" </> "executable_pom.xml")
74− when execPomExists $ removeFile ("java" </> "executable_pom.xml")
75−
7671 cleanLLVM = makeClean "llvm"
7772
7873 makeClean dir = make verbosity [ "-C", dir, "clean", "IDRIS=idris" ]
@@ -83,7 +78,6 @@ idrisClean _ flags _ _ = do
8378
8479idrisConfigure _ flags _ local = do
8580 configureRTS
86− configureJava
8781 where
8882 verbosity = S.fromFlag $ S.configVerbosity flags
8983 version = pkgVersion . package $ localPkgDescr local
@@ -94,12 +88,6 @@ idrisConfigure _ flags _ local = do
9488 -- the file after configure.
9589 configureRTS = make verbosity ["-C", "rts", "clean"]
9690
97− configureJava = do
98− execPomTemplate <- TIO.readFile ("java" </> "executable_pom_template.xml")
99− TIO.writeFile ("java" </> "executable_pom.xml") (insertVersion execPomTemplate)
100− where
101− insertVersion = T.replace (T.pack "$RTS-VERSION$") (T.pack $ display version)
102−
10391-- -----------------------------------------------------------------------------
10492-- Build
10593
@@ -128,7 +116,6 @@ idrisBuild _ flags _ local = do
128116idrisInstall verbosity copy pkg local = do
129117 installStdLib
130118 installRTS
131− installJava
132119 when (usesLLVM $ configFlags local) installLLVM
133120 where
134121 target = datadir $ L.absoluteInstallDirs pkg local copy
@@ -144,10 +131,6 @@ idrisInstall verbosity copy pkg local = do
144131 putStrLn $ "Installing run time system in " ++ target'
145132 makeInstall "rts" target'
146133
147− installJava = do
148− putStrLn $ "Installing java pom template in " ++ target
149− copyFile ("java" </> "executable_pom.xml") (target </> "executable_pom.xml")
150−
151134 installLLVM = do
152135 let target' = target </> "llvm"
153136 putStrLn $ "Installing LLVM library in " ++ target
java/executable_pom_template.xml+6−6
@@ -1,12 +1,11 @@
11<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33 <modelVersion>4.0.0</modelVersion>
4−
5− <name>$ARTIFACT-NAME$</name>
6−
7− <artifactId>$ARTIFACT-NAME$</artifactId>
84 <groupId>org.idris-lang</groupId>
5+ <artifactId>$ARTIFACT-NAME$</artifactId>
6+ <packaging>jar</packaging>
97 <version>1.0</version>
8+ <name>$ARTIFACT-NAME$</name>
109
1110 <properties>
1211 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,12 +14,13 @@
1514 <dependencies>
1615 <dependency>
1716 <groupId>org.idris-lang</groupId>
18− <artifactId>idris</artifactId>
19− <version>$RTS-VERSION$</version>
17+ <artifactId>idris</artifactId>
18+ <version>0.9.10-alpha-1</version>
2019 </dependency>
2120$DEPENDENCIES$
2221 </dependencies>
2322
23+
2424 <build>
2525 <finalName>$ARTIFACT-NAME$</finalName>
2626 <plugins>