diff options
author | Eike Stepper | 2012-09-18 08:57:07 +0000 |
---|---|---|
committer | Eike Stepper | 2012-09-18 08:57:07 +0000 |
commit | 2559aec9f4b6d8874b3c46960936261a1c4db941 (patch) | |
tree | 8c7541be75efcf0f898d2ccf856c4ede545bbdd4 /plugins/org.eclipse.emf.cdo.examples.master | |
parent | 733ffc9d9022f188a3c7295305dc5111ec87ab68 (diff) | |
download | cdo-2559aec9f4b6d8874b3c46960936261a1c4db941.tar.gz cdo-2559aec9f4b6d8874b3c46960936261a1c4db941.tar.xz cdo-2559aec9f4b6d8874b3c46960936261a1c4db941.zip |
Pull specific example artifacts before the Java builder runs
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.master')
7 files changed, 60 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/copyExample.ant b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/copyExample.ant index e8db8a68d4..344747b637 100644 --- a/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/copyExample.ant +++ b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/copyExample.ant @@ -17,9 +17,6 @@ <target name="main"> <copyExample project="${project}" /> - <copy todir="${installer}/examples/${project}/config" - overwrite="true" - file="org.eclipse.emf.cdo.server.product/config/cdo-server.xml" /> </target> </project> diff --git a/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/pullServerConfig.ant b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/pullServerConfig.ant new file mode 100644 index 0000000000..0bbad48bed --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/pullServerConfig.ant @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Eike Stepper - initial API and implementation +--> +<project name="pullServerConfig" default="main" basedir=".."> + + <target name="main"> + <copy todir="." overwrite="true"> + <fileset dir="../org.eclipse.emf.cdo.server.product"> + <exclude name="**/.gitignore" /> + <include name="config/**" /> + </fileset> + </copy> + </target> + +</project> diff --git a/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/pullServerConfig.launch b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/pullServerConfig.launch new file mode 100644 index 0000000000..6e84a934bf --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.examples.master/.externalToolBuilders/pullServerConfig.launch @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> +<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> +<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/> +<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.cdo.examples.master" type="4"/> </resources>}"/> +<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/> +<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/> +<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.eclipse.emf.cdo.examples.master/config" type="2"/> <item path="/org.eclipse.emf.cdo.server.product/config" type="2"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/.externalToolBuilders/pullServerConfig.ant"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.examples.master/.gitignore b/plugins/org.eclipse.emf.cdo.examples.master/.gitignore index c7601f9498..9d60252318 100644 --- a/plugins/org.eclipse.emf.cdo.examples.master/.gitignore +++ b/plugins/org.eclipse.emf.cdo.examples.master/.gitignore @@ -1,2 +1,3 @@ /_database/ /database/ +/config/ diff --git a/plugins/org.eclipse.emf.cdo.examples.master/.project b/plugins/org.eclipse.emf.cdo.examples.master/.project index 8a472fcec1..b9f04e1d61 100644 --- a/plugins/org.eclipse.emf.cdo.examples.master/.project +++ b/plugins/org.eclipse.emf.cdo.examples.master/.project @@ -6,6 +6,20 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> + <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/pullServerConfig.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -26,6 +40,7 @@ </buildCommand> <buildCommand> <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> <key>LaunchConfigHandle</key> diff --git a/plugins/org.eclipse.emf.cdo.examples.master/build.properties b/plugins/org.eclipse.emf.cdo.examples.master/build.properties index b08b97ad07..199647a699 100644 --- a/plugins/org.eclipse.emf.cdo.examples.master/build.properties +++ b/plugins/org.eclipse.emf.cdo.examples.master/build.properties @@ -16,6 +16,7 @@ bin.includes = META-INF/,\ README.html,\ config/ src.includes = about.html,\ - copyright.txt + copyright.txt,\ + ExampleMasterServer.launch generateSourceReferences = true diff --git a/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml index c9ddd819cc..4feec27434 100644 --- a/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml +++ b/plugins/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml @@ -17,7 +17,7 @@ <property name="overrideUUID" value=""/> <property name="supportingAudits" value="true"/> <property name="supportingBranches" value="true"/> - <property name="supportingEcore" value="true"/> + <property name="supportingEcore" value="false"/> <property name="ensureReferentialIntegrity" value="false"/> <property name="allowInterruptRunningQueries" value="true"/> <property name="idGenerationLocation" value="STORE"/> <!-- Possible values: STORE | CLIENT --> |