makefile.mk (2407af08) makefile.mk (60db4cd4)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 24 unchanged lines hidden (view full) ---

33# override buildfile
34ANT_BUILDFILE=build.xml
35
36.INCLUDE : antsettings.mk
37
38.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
39# --- Files --------------------------------------------------------
40
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 24 unchanged lines hidden (view full) ---

33# override buildfile
34ANT_BUILDFILE=build.xml
35
36.INCLUDE : antsettings.mk
37
38.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
39# --- Files --------------------------------------------------------
40
41TARFILE_NAME=commons-logging-1.1.1-src
42TARFILE_MD5=3c219630e4302863a9a83d0efde889db
41TARFILE_NAME=commons-logging-1.1.3-src
42TARFILE_MD5=e8e197d628436490886d17cffa108fe3
43#TARFILE_NAME=commons-logging-1.1.1-src
44#TARFILE_MD5=3c219630e4302863a9a83d0efde889db
43
45
44TARFILE_ROOTDIR=commons-logging-1.1.1-src
46TARFILE_ROOTDIR=commons-logging-1.1.3-src
47#TARFILE_ROOTDIR=commons-logging-1.1.1-src
45
46PATCH_FILES=$(PRJ)$/patches$/logging.patch
47
48CONVERTFILES=build.xml
48
49PATCH_FILES=$(PRJ)$/patches$/logging.patch
50
51CONVERTFILES=build.xml
49
50OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
51
52
53OUT2CLASS=target$/commons-logging-1.1.3.jar
54#OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
55
52.IF "$(SYSTEM_TOMCAT)" != "YES"
53SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
54.ENDIF
55
56.IF "$(JAVACISGCJ)"=="yes"
57JAVA_HOME=
58.EXPORT : JAVA_HOME
59BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar

--- 15 unchanged lines hidden --- 		56.IF "$(SYSTEM_TOMCAT)" != "YES"
57SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
58.ENDIF
59
60.IF "$(JAVACISGCJ)"=="yes"
61JAVA_HOME=
62.EXPORT : JAVA_HOME
63BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar

--- 15 unchanged lines hidden ---