Merge branch 'master' into Luna

Conflicts: build/org.eclipse.birt.releng.birtbuilder/bootstrap.sh
eclipse-birt · Mar 12, 2014 · 8d19380 · 8d19380
2 parents fe0ccc0 + 4b034fe
commit 8d19380
Show file tree

Hide file tree

Showing 5 changed files with 351 additions and 2 deletions.
diff --git a/build/org.eclipse.birt.releng.birtbuilder/bootstrap.sh b/build/org.eclipse.birt.releng.birtbuilder/bootstrap.sh
@@ -53,6 +53,7 @@ bootclasspath="/usr/local/j2sdk1.4.2_13/jre/lib/rt.jar:/usr/local/j2sdk1.4.2_13/
 bootclasspath_15="/usr/local/jdk1.5.0_09/jre/lib/rt.jar:/usr/local/jdk1.5.0_09/jre/lib/jsse.jar"
 bootclasspath_16="/usr/local/jdk1.6.0/jre/lib/rt.jar:/usr/local/jdk1.6.0/jre/lib/jsse.jar"
 jvm15_home="/usr/local/jdk1.5.0_09"
+jvm16_home="/usr/local/jdk1.6.0"
 
 proc=$$
 
@@ -295,6 +296,12 @@ echo $sign >> $LOG_FILE
 # speed up the build process.
 # Please set $birtLocal to the same value as $birtEclipse if you are 
 # building outside BIRT. Do the same to $dtpLocal and $orbitLocal.
+#-Dbirt.url.token=$birtEclipse \
+#-Dbirt.url.newvalue=$birtLocal \
+#-Ddtp.url.token=$dtpEclipse \
+#-Ddtp.url.newvalue=$dtpLocal \
+#-Dorbit.url.token=$orbitEclipse \
+#-Dorbit.url.newvalue=$orbitLocal \
 ########################################################################
 #-Dbirt.url.token=$birtEclipse \
 #-Dbirt.url.newvalue=$birtLocal \
@@ -313,7 +320,7 @@ echo $sign >> $LOG_FILE
 # Set up the full build command
 ########################################################################
 buildCommand="$antRunner -q -buildfile buildAll.xml $testBuild $compareMaps $unitTest $CheckNewJars $skipNL \
--Dbuild.runtimeOSGI=true \
+-Dbuild.runtimeOSGI=true  -DallowBinaryCycles=true \
 -DpostingDirectory=$postingDirectory \
 -Dbootclasspath=$bootclasspath_16 -DbuildType=$buildType -D$buildType=true \
 -DbuildId=$buildId -Dbuildid=$buildId -DbuildLabel=$buildId -Dtimestamp=$timestamp $skipTest $tagMaps \
@@ -323,7 +330,7 @@ buildCommand="$antRunner -q -buildfile buildAll.xml $testBuild $compareMaps $uni
 -DgroupConfiguration=true -DjavacVerbose=true \
 -Dbasebuilder=$WORKING_DIR/org.eclipse.releng.basebuilder \
 -Dtest.dir=$WORKING_DIR/unittest -Dp4.home=$WORKING_DIR/P4 \
--Djvm15_home=$jvm15_home  -DmapTag.properties=$builderDir/mapTag.properties \
+-Djvm15_home=$jvm15_home -Djvm16_home=$jvm16_home -DmapTag.properties=$builderDir/mapTag.properties \
 -Dbuild.date=$builddate -Dpackage.version=4_4_0 -DBranchVersion=4.4.0 -Dant.dir=$ANT_HOME/bin \
 -DmapVersionTag=$BranchName \
 -Ddtp.mapVersionTag=$dtp_BranchName \
@@ -332,6 +339,7 @@ buildCommand="$antRunner -q -buildfile buildAll.xml $testBuild $compareMaps $uni
 -Dbuilder.dir=$builderDir -DupdateSiteConfig=gtk.linux.x86 \
 -DmapGitRoot=$GitRoot \
 -Ddtp.mapGitRoot=$GitRoot_DTP \
+-Dskip.unit.test=true \
 -DBirtRepoCache=git___git_eclipse_org_gitroot_birt_org_eclipse_birt_git"
 
 

diff --git a/build/org.eclipse.birt.releng.birtbuilder/extras/generate_platform/generate.sh b/build/org.eclipse.birt.releng.birtbuilder/extras/generate_platform/generate.sh
@@ -0,0 +1,156 @@
+DISPLAY=:0.0
+export DISPLAY
+
+#==================== COMMON SET UP ================================
+
+export SDK_LOCATION=/home/adb/farrah/director/sdk
+export TARGET_LOCATION=/home/adb/farrah/director/target
+export REPO_LOCATION=/home/adb/farrah/director
+export ECLIPSE_RUNNER=$SDK_LOCATION/eclipse/eclipse
+
+usage="usage: $0 [win|linux]"
+
+case "$1" in
+  win)
+       export PACKAGE_TYPE=win
+       export P2_OS=win32
+       export P2_WS=win32
+       export P2_ARCH=x86;;
+  linux)
+       export PACKAGE_TYPE=linux
+       export P2_OS=linux
+       export P2_WS=gtk
+       export P2_ARCH=x86;;
+  *)
+       echo >&2 "$usage"
+       exit 1;;
+esac
+
+#export Profile=PlatformProfile
+export Profile=SDKProfile
+
+#export ECLIPSE_CVS_URL=http://download.eclipse.org/eclipse/updates/3.7milestones/S-3.7RC2-201105191138/
+#export ECLIPSE_JDT_URL=http://download.eclipse.org/eclipse/updates/3.7milestones/S-3.7RC2-201105191138/
+#export ECLIPSE_PDE_URL=http://download.eclipse.org/eclipse/updates/3.7milestones/S-3.7RC2-201105191138/
+#export EMF_XSD_URL=http://download.eclipse.org/modeling/emf/emf/updates/2.7milestones/
+#export GEF_URL=http://download.eclipse.org/tools/gef/updates/milestones/
+
+export ECLIPSE_CVS_URL=jar:file://$REPO_LOCATION/org.eclipse.cvs-4.4M6.zip!/
+export ECLIPSE_JDT_URL=jar:file://$REPO_LOCATION/org.eclipse.jdt-4.4M6.zip!/
+export ECLIPSE_PDE_URL=jar:file://$REPO_LOCATION/org.eclipse.pde-4.4M6.zip!/
+export EMF_XSD_URL=jar:file://$REPO_LOCATION/emf-xsd-Update-2.10.0M6.zip!/
+export GEF_URL=jar:file://$REPO_LOCATION/GEF-Update-3.9.2M6.zip!/
+
+#==================== COMMON SET UP ================================
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $ECLIPSE_CVS_URL \
+ -artifactRepository $ECLIPSE_CVS_URL \
+ -installIU org.eclipse.cvs.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $ECLIPSE_JDT_URL \
+ -artifactRepository $ECLIPSE_JDT_URL \
+ -installIU org.eclipse.jdt.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $ECLIPSE_PDE_URL \
+ -artifactRepository $ECLIPSE_PDE_URL \
+ -installIU org.eclipse.pde.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $EMF_XSD_URL \
+ -artifactRepository $EMF_XSD_URL \
+ -installIU org.eclipse.emf.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $EMF_XSD_URL \
+ -artifactRepository $EMF_XSD_URL \
+ -installIU org.eclipse.xsd.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $EMF_XSD_URL \
+ -artifactRepository $EMF_XSD_URL \
+ -installIU org.eclipse.xsd.edit.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $GEF_URL \
+ -artifactRepository $GEF_URL \
+ -installIU org.eclipse.gef.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $GEF_URL \
+ -artifactRepository $GEF_URL \
+ -installIU org.eclipse.draw2d.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
diff --git a/build/org.eclipse.birt.releng.birtbuilder/extras/generate_platform/installMylyn.sh b/build/org.eclipse.birt.releng.birtbuilder/extras/generate_platform/installMylyn.sh
@@ -0,0 +1,127 @@
+DISPLAY=:0.0
+export DISPLAY
+
+#==================== COMMON SET UP ================================
+
+export SDK_LOCATION=/home/adb/farrah/director/sdk
+export TARGET_LOCATION=/home/adb/farrah/director/target
+export REPO_LOCATION=/home/adb/farrah/director
+export ECLIPSE_RUNNER=$SDK_LOCATION/eclipse/eclipse
+
+usage="usage: $0 [win|linux]"
+
+case "$1" in
+  win)
+       export PACKAGE_TYPE=win
+       export P2_OS=win32
+       export P2_WS=win32
+       export P2_ARCH=x86;;
+  linux)
+       export PACKAGE_TYPE=linux
+       export P2_OS=linux
+       export P2_WS=gtk
+       export P2_ARCH=x86;;
+  *)
+       echo >&2 "$usage"
+       exit 1;;
+esac
+
+#export Profile=PlatformProfile
+export Profile=SDKProfile
+
+#export MYLYN_REPO_URL=http://download.eclipse.org/mylyn/snapshots/indigo/
+export MYLYN_REPO_URL=jar:file://$REPO_LOCATION/mylyn-3.9.1.v20130917-0100.zip!/
+
+#==================== COMMON SET UP ================================
+
+#install for win
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $MYLYN_REPO_URL \
+ -artifactRepository $MYLYN_REPO_URL \
+ -installIU org.eclipse.mylyn.ide_feature.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $MYLYN_REPO_URL \
+ -artifactRepository $MYLYN_REPO_URL \
+ -installIU org.eclipse.mylyn.java_feature.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $MYLYN_REPO_URL \
+ -artifactRepository $MYLYN_REPO_URL \
+ -installIU org.eclipse.mylyn.bugzilla_feature.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $MYLYN_REPO_URL \
+ -artifactRepository $MYLYN_REPO_URL \
+ -installIU org.eclipse.mylyn.context_feature.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $MYLYN_REPO_URL \
+ -artifactRepository $MYLYN_REPO_URL \
+ -installIU org.eclipse.mylyn_feature.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $MYLYN_REPO_URL \
+ -artifactRepository $MYLYN_REPO_URL \
+ -installIU org.eclipse.mylyn.wikitext_feature.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+
diff --git a/build/org.eclipse.birt.releng.birtbuilder/extras/generate_platform/installWTP.sh b/build/org.eclipse.birt.releng.birtbuilder/extras/generate_platform/installWTP.sh
@@ -0,0 +1,53 @@
+DISPLAY=:0.0
+export DISPLAY
+
+#==================== COMMON SET UP ================================
+
+export SDK_LOCATION=/home/adb/farrah/director/sdk
+export TARGET_LOCATION=/home/adb/farrah/director/target
+export REPO_LOCATION=/home/adb/farrah/director
+export ECLIPSE_RUNNER=$SDK_LOCATION/eclipse/eclipse
+
+usage="usage: $0 [win|linux]"
+
+case "$1" in
+  win)
+       export PACKAGE_TYPE=win
+       export P2_OS=win32
+       export P2_WS=win32
+       export P2_ARCH=x86;;
+  linux)
+       export PACKAGE_TYPE=linux
+       export P2_OS=linux
+       export P2_WS=gtk
+       export P2_ARCH=x86;;
+  *)
+       echo >&2 "$usage"
+       exit 1;;
+esac
+
+#export Profile=PlatformProfile
+export Profile=SDKProfile
+
+#export WTP_REPO_URL=http://download.eclipse.org/webtools/downloads/drops/R3.3.0/S-3.3.0RC2-20110520234832/repository/
+
+export WTP_REPO_URL=jar:file://$REPO_LOCATION/wtp4x-repo-M-3.5.1RC4-20130913223750.zip!/
+
+#==================== COMMON SET UP ================================
+
+#install for win
+$ECLIPSE_RUNNER \
+ -application org.eclipse.equinox.p2.director \
+ -metadataRepository $WTP_REPO_URL \
+ -artifactRepository $WTP_REPO_URL \
+ -installIU org.eclipse.wst.xml_ui.feature.feature.group \
+ -destination $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -profile $Profile \
+ -bundlepool $TARGET_LOCATION/$PACKAGE_TYPE/eclipse \
+ -p2.os  $P2_OS \
+ -p2.ws  $P2_WS \
+ -p2.arch $P2_ARCH \
+ -roaming -vmargs \
+ -Declipse.p2.data.area=$TARGET_LOCATION/$PACKAGE_TYPE/eclipse/p2
+
+
diff --git a/...ort.model/src/org/eclipse/birt/report/model/elements/strategy/CellPropSearchStrategy.java b/...ort.model/src/org/eclipse/birt/report/model/elements/strategy/CellPropSearchStrategy.java
@@ -257,6 +257,11 @@ public Object getPropertyFromSelfSelector( Module module,
 	private Object getPropertyFromColumn( Module module, TableColumn column,
 			ElementPropertyDefn prop )
 	{
+		if ( prop.getName( ).equals( IStyleModel.WIDTH_PROP ) )
+		{
+			return null;
+		}
+
 		if ( column != null )
 		{
 			return column.getStrategy( ).getPropertyFromElement( module,