Selaa lähdekoodia

Specified to skip base and removed unused base properties.

Alexander Nyßen 14 vuotta sitten
vanhempi
commit
ee1a264e67

+ 12 - 26
de.itemis.xtext.utils/releng/de.itemis.xtext.utils.releng/build/build.properties

@@ -20,13 +20,6 @@
 
 buildDirectory=${buildWorkspace}/buildDirectory
 
-# Paths
-#javaDirectory=??
-#J2SE-1.3-dir=${javaDirectory}/jre1.3.1
-#J2SE-1.4-dir=${javaDirectory}/jre1.4.2
-#J2SE-1.5-dir=${javaDirectory}/jre1.5.0
-#JavaSE-1.6-dir=${javaDirectory}/jdk1.6.0
-
 #####################
 # Parameters describing how and where to execute the build.
 # Typical users need only update the following properties:
@@ -163,25 +156,18 @@ generateFeatureVersionSuffix=true
 # installed Eclipse against which the application or plug-in code will be compiled and the RCP delta pack.
 
 base=${buildWorkspace}/base
-baseCache=${buildWorkspace}/base_cache
-baseLocation=${base}/eclipse
+baseLocation=
 
 #Folder containing repositories whose content is needed to compile against
-#repoBaseLocation=${base}/repos
+repoBaseLocation=${buildWorkspace}/repoBase
 #Folder where the content of the repositories from ${repoBaseLocation} will be made available as a form suitable to be compiled against
 #transformedRepoLocation=${base}/transformedRepos
+transformedRepoLocation=${buildWorkspace}/transformedRepo
 
 #Os/Ws/Arch/nl of the eclipse specified by baseLocation
-baseos=linux
-basews=gtk
-basearch=x86_64
-
-baseBuildID=201102101200
-baseBuildMilestone=3.6.2
-baseReleaseMilestone=3.6
-baseBuildType=R
-baseBuildSymbolicName=helios
-baseArchiveFormat=tar.gz
+#baseos=linux
+#basews=gtk
+#basearch=x86_64
 
 #this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
 filteredDependencyCheck=false
@@ -196,7 +182,7 @@ resolution.devMode=false
 #- the location of a feature.xml, or for 2.1 style plugins, the plugin.xml or fragment.xml
 #pluginPath=
 
-skipBase=false
+skipBase=true
 
 ############# MAP FILE CONTROL ################
 # This section defines CVS tags to use when fetching the map files from the repository.
@@ -261,11 +247,11 @@ javacSource=1.6
 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
 javacTarget=1.6
 
-p2.flavor=tooling
-#p2.category.definition=file:${buildDirectory}/features/de.itemis.xtext.utils/category.xml
-p2.metadata.repo=file:${buildDirectory}/p2_repository
-p2.artifact.repo=file:${buildDirectory}/p2_repository
+#p2.flavor=tooling
+p2.category.definition=file:${buildWorkspace}/releng/category.xml
+#p2.metadata.repo=file:${buildDirectory}/p2_repository
+#p2.artifact.repo=file:${buildDirectory}/p2_repository
 		
 #collect the generated artifacts and place them inside the repository
 p2.gathering=true
-p2.build.repo=file:${buildDirectory}/p2_build_repository
+p2.build.repo=file:${buildDirectory}/build_local_repository

+ 1 - 3
de.itemis.xtext.utils/releng/de.itemis.xtext.utils.releng/build/build.xml

@@ -1,11 +1,9 @@
 <project name="run.xml" default="all" basedir=".">
 
-	<property environment="env" />
-
 	<!-- include additional libraries -->
-	<!--<taskdef resource="net/sf/ant4eclipse/antlib.xml" classpath="../lib/ant4eclipse-0.6.0.jar" />-->
 	<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${libs}/ant-contrib-1.0b3.jar" />
 
+	<property environment="env" />
 	<!-- change this property if the build.properties is placed in another folder -->
 	<property name="${builder}" value="${basedir}" />