git.iko.soy/Idris-dev
on master help sign in
Reverting the change to the POM template and removing the templating/clenup logic for the Java backend.
14ef6f1Gabe McArthur
Setup.hs−17
compare with master
unifiedsplit
@@ -60,7 +60,6 @@ usesEffects flags =
60idrisClean _ flags _ _ = do
60idrisClean _ flags _ _ = do
61 cleanStdLib
61 cleanStdLib
62 cleanLLVM
62 cleanLLVM
63− cleanJava
64 where
63 where
65 verbosity = S.fromFlag $ S.cleanVerbosity flags
64 verbosity = S.fromFlag $ S.cleanVerbosity flags
66
65
@@ -69,10 +68,6 @@ idrisClean _ flags _ _ = do
69 makeClean "effects"
68 makeClean "effects"
70 makeClean "javascript"
69 makeClean "javascript"
71
70
72− cleanJava = do
73− execPomExists <- doesFileExist ("java" </> "executable_pom.xml")
74− when execPomExists $ removeFile ("java" </> "executable_pom.xml")
75−
76 cleanLLVM = makeClean "llvm"
71 cleanLLVM = makeClean "llvm"
77
72
78 makeClean dir = make verbosity [ "-C", dir, "clean", "IDRIS=idris" ]
73 makeClean dir = make verbosity [ "-C", dir, "clean", "IDRIS=idris" ]
@@ -83,7 +78,6 @@ idrisClean _ flags _ _ = do
83
78
84idrisConfigure _ flags _ local = do
79idrisConfigure _ flags _ local = do
85 configureRTS
80 configureRTS
86− configureJava
87 where
81 where
88 verbosity = S.fromFlag $ S.configVerbosity flags
82 verbosity = S.fromFlag $ S.configVerbosity flags
89 version = pkgVersion . package $ localPkgDescr local
83 version = pkgVersion . package $ localPkgDescr local
@@ -94,12 +88,6 @@ idrisConfigure _ flags _ local = do
94 -- the file after configure.
88 -- the file after configure.
95 configureRTS = make verbosity ["-C", "rts", "clean"]
89 configureRTS = make verbosity ["-C", "rts", "clean"]
96
90
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−
103-- -----------------------------------------------------------------------------
91-- -----------------------------------------------------------------------------
104-- Build
92-- Build
105
93
@@ -128,7 +116,6 @@ idrisBuild _ flags _ local = do
128idrisInstall verbosity copy pkg local = do
116idrisInstall verbosity copy pkg local = do
129 installStdLib
117 installStdLib
130 installRTS
118 installRTS
131− installJava
132 when (usesLLVM $ configFlags local) installLLVM
119 when (usesLLVM $ configFlags local) installLLVM
133 where
120 where
134 target = datadir $ L.absoluteInstallDirs pkg local copy
121 target = datadir $ L.absoluteInstallDirs pkg local copy
@@ -144,10 +131,6 @@ idrisInstall verbosity copy pkg local = do
144 putStrLn $ "Installing run time system in " ++ target'
131 putStrLn $ "Installing run time system in " ++ target'
145 makeInstall "rts" target'
132 makeInstall "rts" target'
146
133
147− installJava = do
148− putStrLn $ "Installing java pom template in " ++ target
149− copyFile ("java" </> "executable_pom.xml") (target </> "executable_pom.xml")
150−
151 installLLVM = do
134 installLLVM = do
152 let target' = target </> "llvm"
135 let target' = target </> "llvm"
153 putStrLn $ "Installing LLVM library in " ++ target
136 putStrLn $ "Installing LLVM library in " ++ target
java/executable_pom_template.xml+6−6
@@ -1,12 +1,11 @@
1<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 <modelVersion>4.0.0</modelVersion>
3 <modelVersion>4.0.0</modelVersion>
4−
5− <name>$ARTIFACT-NAME$</name>
6−
7− <artifactId>$ARTIFACT-NAME$</artifactId>
8 <groupId>org.idris-lang</groupId>
4 <groupId>org.idris-lang</groupId>
5+ <artifactId>$ARTIFACT-NAME$</artifactId>
6+ <packaging>jar</packaging>
9 <version>1.0</version>
7 <version>1.0</version>
8+ <name>$ARTIFACT-NAME$</name>
10
9
11 <properties>
10 <properties>
12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,12 +14,13 @@
15 <dependencies>
14 <dependencies>
16 <dependency>
15 <dependency>
17 <groupId>org.idris-lang</groupId>
16 <groupId>org.idris-lang</groupId>
18− <artifactId>idris</artifactId>
17+ <artifactId>idris</artifactId>
19− <version>$RTS-VERSION$</version>
18+ <version>0.9.10-alpha-1</version>
20 </dependency>
19 </dependency>
21$DEPENDENCIES$
20$DEPENDENCIES$
22 </dependencies>
21 </dependencies>
23
22
23+
24 <build>
24 <build>
25 <finalName>$ARTIFACT-NAME$</finalName>
25 <finalName>$ARTIFACT-NAME$</finalName>
26 <plugins>
26 <plugins>