Skip to content

Commit

Permalink
Finally bump the version number to 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
gilith committed Mar 1, 2018
1 parent 01baa11 commit 47918a6
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Makefile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 10 additions & 2 deletions doc/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
30 changes: 22 additions & 8 deletions repo/admin/check/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(); }
}
Expand Down Expand Up @@ -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');
Expand All @@ -307,7 +321,6 @@ function packages_out_of_sync() {

$issue = '<ul>';

$i = 0;
for ($i = 0; $i < $n; ++$i) {
$namever = $unregistered_staged[$i];

Expand All @@ -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>';
}
}

Expand All @@ -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 .
Expand All @@ -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 ||
Expand Down Expand Up @@ -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 .
Expand Down
13 changes: 13 additions & 0 deletions repo/php/opentheory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions scripts/upload-repo
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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__
Expand Down
4 changes: 2 additions & 2 deletions src/opentheory.sml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 47918a6

Please sign in to comment.