diff options
| author |   Alessandro Iezzi <aiezzi@alessandroiezzi.it> | 2021-04-06 22:41:23 +0200 |
|---|---|---|
| committer | Alessandro Iezzi <aiezzi@alessandroiezzi.it> | 2021-04-06 22:41:23 +0200 |
| commit | e6414b63a56deae90928808f9d0a6c9e2364b63d (patch) | |
| tree | 836e158bf153723837a783939a0f9c104a59d7f9 | |
| parent | e478df9b43333aab3c730aeee79fe1448305ae3c (diff) | |
| parent | 0b53187ef9ed8a27427c8a303a97744f8f02e81c (diff) | |
| download | hyde-e6414b63a56deae90928808f9d0a6c9e2364b63d.tar.gz hyde-e6414b63a56deae90928808f9d0a6c9e2364b63d.zip | |
Resolve conflicts
| -rw-r--r-- | Makefile | 29 | ||||
| -rw-r--r-- | pom.xml | 11 |
2 files changed, 24 insertions, 16 deletions
@@ -1,20 +1,27 @@ -INSTALLDIR=/usr/local -DESTDIR=${INSTALLDIR}/genwebsite -JAR=${DESTDIR}/genwebsite.jar -LAUNCHER=genwebsite -BUILDDIR=target +APPNAME=hyde +INSTALLDIR=~ +DESTDIR=${INSTALLDIR}/.${APPNAME} +JAR=${DESTDIR}/${APPNAME}.jar +LAUNCHER=${APPNAME} dist: mvn package - cp genwebsite.sh.mk ${BUILDDIR}/${LAUNCHER}.sh - chmod +x ${BUILDDIR}/${LAUNCHER}.sh - sed -i "" "s|DESTDIR|${JAR}|" ${BUILDDIR}/${LAUNCHER}.sh + +env: + @echo "APPNAME = "${APPNAME} + @echo "INSTALLDIR = "${INSTALLDIR} + @echo "DESTDIR = "${DESTDIR} + @echo "JAR = "${JAR} + @echo "LAUNCHER = "${LAUNCHER} install: mkdir -p ${DESTDIR} - cp target/genwebsite-*-jar-with-dependencies.jar ${JAR} - cp ${BUILDDIR}/${LAUNCHER}.sh ${DESTDIR} - ln -s -f ${DESTDIR}/${LAUNCHER}.sh ${INSTALLDIR}/bin/${LAUNCHER} + cp target/${APPNAME}-*-jar-with-dependencies.jar ${JAR} + cp ${APPNAME}.sh.mk ${LAUNCHER}.sh + chmod +x ${LAUNCHER}.sh + sed -i "" "s|DESTDIR|${JAR}|" ${LAUNCHER}.sh + cp ${APPNAME}.sh ${DESTDIR} + ln -s ${DESTDIR}/${LAUNCHER}.sh ${INSTALLDIR}/bin/${LAUNCHER} clean: rm -rf ${BUILDDIR} @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>it.alessandroiezzi</groupId> - <artifactId>genwebsite</artifactId> + <artifactId>hyde</artifactId> <version>0.0.1</version> - <name>genwebsite</name> + <name>hyde</name> <!-- FIXME change it to the project's website --> - <url>http://www.example.com</url> + <url>https://github.com/aindros/hyde</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |