Commits

Jan Lahoda  committed e1fc38b Merge

Automated merge with file:///media/karta/space/src/jackpot30/working

  • Participants
  • Parent commits 143a588, 3e5a277

Comments (0)

Files changed (3)

File hudson/download-extra-nbms.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project name="platform" default="download" basedir="..">
+    <target name="download" unless="no.download">
+        <mkdir dir="${nbplatform.default.netbeans.dest.dir}"/>
+        <property name="tasks.jar" location="${nbplatform.default.harness.dir}/tasks.jar"/>
+        <taskdef name="autoupdate" classname="org.netbeans.nbbuild.AutoUpdate" classpath="${tasks.jar}"/>
+        <autoupdate installdir="${nbplatform.default.netbeans.dest.dir}" updatecenter="http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/nbms/updates.xml.gz">
+            <modules includes=".*junit4.*" clusters="platform"/>
+        </autoupdate>
+    </target>
+</project>

File hudson/trunk

     unzip -q ../download/*$TRUNK_ID-$1.zip || exit
 }
 
-for cluster in ide platform java harness nb apisupport extra enterprise cnd dlight websvccommon; do
+for cluster in ide platform java harness nb apisupport enterprise cnd dlight websvccommon; do
     download_and_unpack_cluster $cluster;
 done
 
 cd ../..
 
 PLATFORM=$PWD/nbbuild/netbeans
+
+ant -f hudson/download-extra-nbms.xml -Dnbplatform.default.harness.dir=$PLATFORM/harness -Dnbplatform.default.netbeans.dest.dir=$PLATFORM
 }
 
 if [ "$PLATFORM" == "" ] ; then

File remoting/build.sh

 (cd build; zip -r indexing-backend.zip indexing-backend) || exit 1
 (cd build; zip -r indexing-backend-shortened.zip `find indexing-backend -type f | grep -v indexing-backend/indexer/enterprise/ | grep -v indexing-backend/indexer/apisupport/  | grep -v indexing-backend/indexer/cnd/   | grep -v indexing-backend/indexer/dlight/   | grep -v indexing-backend/indexer/harness/   | grep -v indexing-backend/indexer/ide/   | grep -v indexing-backend/indexer/java   | grep -v indexing-backend/indexer/nb/   | grep -v indexing-backend/indexer/platform/   | grep -v indexing-backend/indexer/profiler/   | grep -v indexing-backend/indexer/websvccommon/`) || exit 1
 
-(cd server/hudson; mvn $MAVEN_EXTRA_ARGS -Dmaven.test.skip=true clean package && cp target/*.hpi ../../build) || exit
+(cd server/hudson; mvn $MAVEN_EXTRA_ARGS -Dmaven.test.skip=true clean package && (cp target/*.hpi ../../build || true)) || exit
 
 mkdir -p ide/local/release/index-server
 (cd server/web/web.main; cp -r dist/* ../../../ide/local/release/index-server) || exit 1