4 files changed, 32 insertions, 16 deletions
diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE
index 4d32f0e2e1..93b6285cfb 100644
--- a/src/intellij/scala-lang.ipr.SAMPLE
+++ b/src/intellij/scala-lang.ipr.SAMPLE
@@ -32,7 +32,7 @@
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
-  </component>
+  </component>  
   <component name="InspectionProjectProfileManager">
     <profiles>
       <profile version="1.0" is_locked="false">
@@ -201,6 +201,7 @@
       <module fileurl="file://$PROJECT_DIR$/library.iml" filepath="$PROJECT_DIR$/library.iml" />
       <module fileurl="file://$PROJECT_DIR$/manual.iml" filepath="$PROJECT_DIR$/manual.iml" />
       <module fileurl="file://$PROJECT_DIR$/partest.iml" filepath="$PROJECT_DIR$/partest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/scala.iml" filepath="$PROJECT_DIR$/scala.iml" />
       <module fileurl="file://$PROJECT_DIR$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" />
       <module fileurl="file://$PROJECT_DIR$/swing.iml" filepath="$PROJECT_DIR$/swing.iml" />
     </modules>
diff --git a/src/intellij/scala.iml.SAMPLE b/src/intellij/scala.iml.SAMPLE
new file mode 100644
index 0000000000..8ea9d0dd71
--- /dev/null
+++ b/src/intellij/scala.iml.SAMPLE
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../.." />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/tools/epfl-publish b/tools/epfl-publish
index 4982f930bb..de5e17b13f 100755
--- a/tools/epfl-publish
+++ b/tools/epfl-publish
@@ -25,8 +25,8 @@ else
   echo "Publishing nightly build to $publish_to"
   # Archive Scala nightly distribution
   rsync -az dists/archives/ "$publish_to/distributions"
-  # don't publish docs in 2.8.x
-  [[ $version == "2.8.x" ]] || rsync -az build/scaladoc/ "$publish_to/docs"
+  # only publish scaladoc nightly for trunk
+  [[ $version == "master" ]] && rsync -az build/scaladoc/ "$publish_to/docs"
   # sbaz
   [[ -d dists/sbaz ]] && rsync -az dists/sbaz/ "$publish_to/sbaz"
 fi
diff --git a/tools/get-scala-revision b/tools/get-scala-revision
index 8441b29070..8747fdc3fb 100755
--- a/tools/get-scala-revision
+++ b/tools/get-scala-revision
@@ -11,26 +11,31 @@
 [[ $# -eq 0 ]] || cd "$1"
 
 ensure_tag () {
-  # v2.10.0-M1
-  fallback=58cb15c40d
-  [[ -n $(git tag -l v2.10.0-M1) ]] || {
-    git tag -a -m "generated by get-scala-revision" v2.10.0-M1 $fallback
+  sha=$1
+  rev=$2
+  
+  [[ -n $(git tag -l $rev) ]] || {
+    git tag -a -m "generated by get-scala-revision" $rev $sha
   }
 }
-ensure_tag
+
+# Ensure some baseline tags are present so if this repository's
+# tags are screwed up or stale, we should still have a reference
+# point for a build string.
+ensure_tag 58cb15c40d v2.10.0-M1
+ensure_tag 29f3eace1e v2.9.1
+ensure_tag b0d78f6b9c v2.8.2
 
 # the closest tag, obtained separately because we have to
 # reconstruct the string around the padded distance.
-tag=$(git describe --match 'v2*' --abbrev=0)
+tag=$(git describe --tags --match 'v2*' --abbrev=0)
 
-# the full string - padding correctness depends on abbrev=10.
-described=$(git describe --match 'v2*' --abbrev=10)
+# printf %016s is not portable for 0-padding, has to be a digit.
+# so we're stuck disassembling it.
+described=$(git describe --tags --match 'v2*' --abbrev=10)
 suffix="${described##${tag}-}"
 counter=$(echo $suffix | cut -d - -f 1)
 hash=$(echo $suffix | cut -d - -f 2)
 
-# 016 is rocket-surgically-calibrated to pad the distance from the
-# tag to the current commit into a 4-digit number - since maven
-# will be treating this as a string, the ide depends on
-# 10 being greater than 9 (thus 0010 and 00009.)
-printf "%s-%04d-%10s-%s\n" "$tag" "$counter" "$hash" $(date "+%Y-%m-%d")
+# v2.10.0-M1-0098-g6f1c486d0b-2012-02-01
+printf "%s-%04d-%s-%s\n" "$tag" "$counter" "$hash" $(date "+%Y-%m-%d")