Releng:
- don't use existing artifacts compiled for OTRE
- unify property value to "otdre"
diff --git a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/OTWeavingHook.java b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/OTWeavingHook.java
index 5b923cd..bfdeb9e 100644
--- a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/OTWeavingHook.java
+++ b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/OTWeavingHook.java
@@ -73,7 +73,11 @@
// TODO: this master-switch, which selects the weaver, should probably be replaced by s.t. else?
- boolean useDynamicWeaver = "dynamic".equals(System.getProperty("ot.weaving"));
+ static final boolean useDynamicWeaver;
+ static {
+ String weaving = System.getProperty("ot.weaving");
+ useDynamicWeaver = (weaving != null) && weaving.toLowerCase().equals("otdre");
+ }
// TODO: temporary switch to fall back to coarse grain checking:
boolean skipBaseClassCheck = "skip".equals(System.getProperty("otequinox.baseClassChecks"));
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 75470cc..ead86d9 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -275,6 +275,7 @@
<!-- pre-load updateSite with published releases: -->
<mkdir dir="${otdtUpdatesDir}/plugins"/>
<mkdir dir="${otdtUpdatesDir}/features"/>
+<!-- don't use previous artifacts during the transition to OTDRE:
<exec executable="/bin/sh">
<arg value="-c"/>
<arg value="ln -s ${published.updates}/features/* ${otdtUpdatesDir}/features/"/>
@@ -283,12 +284,15 @@
<arg value="-c"/>
<arg value="ln -s ${published.updates}/plugins/* ${otdtUpdatesDir}/plugins/"/>
</exec>
+-->
<!-- pre-load category-less metadata: -->
+<!--
<copy failonerror="false" flatten="true" toDir="${otdtUpdatesDir}">
<fileset dir="${user.dir}/metadata">
<include name="*.xml"/>
</fileset>
</copy>
+-->
<echo message="Invoke pdebuild for creating a full OTDT"/>
<java