From 47918a6d557593b4e6859ac302ce76bbdfb36625 Mon Sep 17 00:00:00 2001
From: Joe Leslie-Hurd <joe@gilith.com>
Date: Thu, 1 Mar 2018 10:40:06 -0800
Subject: [PATCH] Finally bump the version number to 1.4

---
 Makefile.dev               |  4 ++--
 doc/changelog.html         | 12 ++++++++++--
 doc/download.html          |  2 +-
 doc/index.html             |  2 +-
 repo/admin/check/index.php | 30 ++++++++++++++++++++++--------
 repo/php/opentheory.php    | 13 +++++++++++++
 scripts/upload-repo        |  6 +++---
 src/opentheory.sml         |  4 ++--
 8 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/Makefile.dev b/Makefile.dev
index 040a8d93..e240c76b 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -347,14 +347,14 @@ tarball: clean doc/DONT-RELEASE Makefile.dev
 
 .PHONY: release-instructions
 release-instructions:
-	@echo "*************************************************************"
+	@echo "==============================================================="
 	@echo "Completed release, now do the following:"
 	@echo "1. git add, commit and push all changes"
 	@perl -ne 'if ($$_ =~ /^opentheory ([0-9.]+) \(release ([0-9]+)\),$$/) { print "2. git tag -a -s v$$1.$$2 -m \"Version $$1 (release $$2)\"\n"; }' doc/download.html
 	@echo "3. git push --tags"
 	@echo "4. Browse to github > opentheory > releases > Latest release"
 	@echo "5. Add the release name and tarball"
-	@echo "*************************************************************"
+	@echo "==============================================================="
 
 .PHONY: release
 release: release-stamp mosml mlton polyml documentation
diff --git a/doc/changelog.html b/doc/changelog.html
index ab2b5152..a7be6050 100644
--- a/doc/changelog.html
+++ b/doc/changelog.html
@@ -26,13 +26,21 @@
 
 <h3>Changes to the opentheory tool</h3>
 
-<p>Recent changes</p>
+<!-- <p>Recent changes</p> -->
+
+<p>Version 1.4: 1 March 2018</p>
 
 <ul>
 
 <li>Moved development of the opentheory tool to
 
-<a href="https://github.com/gilith/opentheory">github</a>.</li>
+<a href="https://github.com/gilith/opentheory">GitHub</a>
+
+and archiving
+
+<a href="https://github.com/gilith/opentheory/releases">releases</a>
+
+there to enable build reproducibility.</li>
 
 <li>Support for
 
diff --git a/doc/download.html b/doc/download.html
index 8d8292b3..af632ebc 100644
--- a/doc/download.html
+++ b/doc/download.html
@@ -28,7 +28,7 @@ <h3>Download the opentheory tool</h3>
 
 <p>The latest version is
 
-opentheory 1.3 (release 20180226),
+opentheory 1.4 (release 20180301),
 
 and can be downloaded in the following formats:</p>
 
diff --git a/doc/index.html b/doc/index.html
index b01a63ad..78519d7f 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -65,7 +65,7 @@ <h3>Project status</h3>
 
 is
 
-opentheory 1.3 (release 20180226).
+opentheory 1.4 (release 20180301).
 
 The opentheory tool is free software, released under the
 
diff --git a/repo/admin/check/index.php b/repo/admin/check/index.php
index d889b5a7..2979b011 100644
--- a/repo/admin/check/index.php
+++ b/repo/admin/check/index.php
@@ -112,7 +112,8 @@ function SelectSyncData($field) {
     parent::SelectValue($field);
 
     $this->_select_submit =
-      new SelectSubmit($this->field() . 'x', 'sync timestamps');
+      new SelectSubmit($this->field() . 'x',
+                       'change package timestamps to match database records');
 
     if ($this->submitted()) { $this->validate(); }
   }
@@ -280,7 +281,20 @@ function packages_out_of_sync() {
 }
 
 if ($select_sync->submitted()) {
-  trigger_error('synchronizing timestamps is not implemented');
+  $out_of_sync = packages_out_of_sync();
+
+  $n = count($out_of_sync);
+
+  for ($i = 0; $i < $n; ++$i) {
+    $data = $out_of_sync[$i];
+    $namever = $data[0];
+
+    $pkg = find_package_by_name_version($namever);
+    isset($pkg) or trigger_error('package disappeared from database');
+    $registered = $pkg->registered();
+
+    opentheory_set_timestamp($namever,$registered);
+  }
 
   if (is_script()) {
     output_script('successfully synchronized package timestamps');
@@ -307,7 +321,6 @@ function packages_out_of_sync() {
 
       $issue = '<ul>';
 
-      $i = 0;
       for ($i = 0; $i < $n; ++$i) {
         $namever = $unregistered_staged[$i];
 
@@ -323,7 +336,8 @@ function packages_out_of_sync() {
           $k = $n - 2 * SHORT_UNREGISTERED_STAGED_PACKAGES;
 
           $issue .=
-'<li><em>...' . $k . ' unregistered staged packages omitted...</em></li>';
+'</ul><p><em>...' . pretty_number($k) .
+' unregistered staged packages omitted...</em></p><ul>';
         }
       }
 
@@ -332,7 +346,7 @@ function packages_out_of_sync() {
       $select_staged->set_value($unregistered_staged_names);
 
       $issues[] =
-'<h2>Issue: ' . $n . ' Unregistered Staged Package' .
+'<h2>Issue: ' . pretty_number($n) . ' Unregistered Staged Package' .
 (($n == 1) ? '' : 's') .
 '</h2>' .
 $issue .
@@ -349,7 +363,6 @@ function packages_out_of_sync() {
 
       $issue = '<ul>';
 
-      $i = 0;
       for ($i = 0; $i < $n; ++$i) {
         if ($n <= 2 * SHORT_PACKAGES_OUT_OF_SYNC + 1 ||
             $i < SHORT_PACKAGES_OUT_OF_SYNC ||
@@ -378,14 +391,15 @@ function packages_out_of_sync() {
           $k = $n - 2 * SHORT_PACKAGES_OUT_OF_SYNC;
 
           $issue .=
-'<li><em>...' . $k . ' unsynchronized packages omitted...</em></li>';
+'</ul><p><em>...' . pretty_number($k) .
+' unsynchronized packages omitted...</em></p><ul>';
         }
       }
 
       $issue .= '</ul>';
 
       $issues[] =
-'<h2>Issue: ' . $n . ' Package Timestamp' .
+'<h2>Issue: ' . pretty_number($n) . ' Package Timestamp' .
 (($n == 1) ? '' : 's') .
 ' Out of Sync</h2>' .
 $issue .
diff --git a/repo/php/opentheory.php b/repo/php/opentheory.php
index 53d22999..03effdfb 100644
--- a/repo/php/opentheory.php
+++ b/repo/php/opentheory.php
@@ -370,6 +370,19 @@ function opentheory_staged_timestamp($name_version) {
   return $timestamp;
 }
 
+function opentheory_set_timestamp($name_version, $timestamp) {
+  isset($name_version) or trigger_error('bad name_version');
+  isset($timestamp) or trigger_error('bad timestamp');
+
+  $file = site_path($name_version->tarball_path());
+
+  $mod_time = $timestamp->to_datetime($timestamp);
+
+  if (!touch($file,$mod_time)) {
+    trigger_error('couldn\'t change timestamp for file ' . $file);
+  }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Query whether a package is empty.
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/scripts/upload-repo b/scripts/upload-repo
index 8bab42d1..f51c4e8c 100755
--- a/scripts/upload-repo
+++ b/scripts/upload-repo
@@ -23,8 +23,8 @@ my @EXCLUSIONS =
    ('.DS_Store',
     '.gitignore');
 
-my $user = ($opt_l ? "gilith" : "joe");
-my $host = ($opt_l ? "login.gilith.com" : "localhost");
+my $user = "joe";
+my $host = "localhost";
 
 sub upload_dir {
     (scalar @_ == 3) or die;
@@ -75,7 +75,7 @@ if ($opt_l) {
     }
 }
 
-my $repo_remote_dir = ($opt_l ? "public_opentheory" : "www/mordor");
+my $repo_remote_dir = ($opt_l ? "www/opentheory" : "www/mordor");
 upload_dir "repo", $repo_remote_dir, \@repo_exclusions;
 
 __END__
diff --git a/src/opentheory.sml b/src/opentheory.sml
index 3c810a38..cc96c168 100644
--- a/src/opentheory.sml
+++ b/src/opentheory.sml
@@ -19,9 +19,9 @@ and rootHomeDir = ".opentheory";
 
 val program = "opentheory";
 
-val version = "1.3";
+val version = "1.4";
 
-val release = " (release 20180226)";
+val release = " (release 20180301)";
 
 val homepage = "http://www.gilith.com/software/opentheory"