From: Bharat M. <bh...@us...> - 2005-05-21 20:21:14
|
Update of /cvsroot/gallery/java/gallery2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21519 Modified Files: Makefile Log Message: Updated to require JDK 1.1.8 Index: Makefile =================================================================== RCS file: /cvsroot/gallery/java/gallery2/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 16 Oct 2003 07:01:40 -0000 1.2 +++ Makefile 21 May 2005 20:21:04 -0000 1.3 @@ -1,16 +1,20 @@ -JAVAC = javac -JAR = jar +JAVA_HOME = /usr/local/jdk1.1.8 +JAVAC ?= ${JAVA_HOME}/bin/javac +JAVA ?= ${JAVA_HOME}/bin/java +JAR ?= ${JAVA_HOME}/bin/jar +JAVA_VERSION = $(shell JAVA_HOME=${JAVA_HOME} ${JAVA} -version 2>&1) +EXPECTED_JAVA_VERSION = java version "1.1.8" -all: build/classes build/ImageCrop.jar +all: check-jdk118 build/classes build/ImageCrop.jar build/classes: mkdir -p build/classes build/ImageCrop.jar: ImageCrop.class - (cd build/classes && ${JAR} cvf ../ImageCrop.jar *) + (cd build/classes && JAVA_HOME=${JAVA_HOME} ${JAR} cvf ../ImageCrop.jar *) ImageCrop.class: ImageCrop.java - ${JAVAC} -d build/classes ImageCrop.java + JAVA_HOME=${JAVA_HOME} ${JAVAC} -d build/classes ImageCrop.java clean: rm -rf build @@ -19,3 +23,13 @@ # install: build/ImageCrop.jar cp build/ImageCrop.jar /usr/www/website/menalto.com/dev/gallery/gallery/modules/core/plugins + +check-jdk118: + echo a: ${JAVA_VERSION} + echo b: ${EXPECTED_JAVA_VERSION} + @if [ "${JAVA_VERSION}" != "${EXPECTED_JAVA_VERSION}" ]; then \ + echo "We require ${EXPECTED_JAVA_VERSION} for browser compatibility"; \ + exit 1; \ + fi + +.PHONY: check-jdk118 |