You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2014/08/13 19:13:47 UTC
[1/2] git commit: Fix version number glitches.
Repository: lucy-clownfish
Updated Branches:
refs/heads/prep_0.4.0 168e87dc1 -> d9f238253
Fix version number glitches.
This commit will be consolidated into another before merging to master.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/70599792
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/70599792
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/70599792
Branch: refs/heads/prep_0.4.0
Commit: 70599792a27a64be3ef4eeb156903947ad560304
Parents: 168e87d
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Wed Aug 13 10:12:10 2014 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Aug 13 10:12:10 2014 -0700
----------------------------------------------------------------------
compiler/python/setup.py | 2 +-
runtime/common/charmonizer.c | 2 +-
runtime/common/charmonizer.main | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/70599792/compiler/python/setup.py
----------------------------------------------------------------------
diff --git a/compiler/python/setup.py b/compiler/python/setup.py
index dc809b7..b5d5c10 100644
--- a/compiler/python/setup.py
+++ b/compiler/python/setup.py
@@ -185,7 +185,7 @@ cfc_extension = Extension('clownfish._cfc',
sources = c_filepaths)
setup(name = 'clownfish-cfc',
- version = '0.4.0,
+ version = '0.4.0',
description = 'Clownfish compiler',
author = 'Apache Lucy Project',
author_email = 'dev at lucy dot apache dot org',
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/70599792/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c
index 5f70ace..94796a3 100644
--- a/runtime/common/charmonizer.c
+++ b/runtime/common/charmonizer.c
@@ -7094,7 +7094,7 @@ typedef struct SourceFileContext {
} SourceFileContext;
static const char cfish_version[] = "0.4.0";
-static const char cfish_major_version[] = "0.4.0";
+static const char cfish_major_version[] = "0.4";
static void
S_add_compiler_flags(struct chaz_CLIArgs *args) {
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/70599792/runtime/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.main b/runtime/common/charmonizer.main
index 8fb8b97..ef0c05f 100644
--- a/runtime/common/charmonizer.main
+++ b/runtime/common/charmonizer.main
@@ -43,7 +43,7 @@ typedef struct SourceFileContext {
} SourceFileContext;
static const char cfish_version[] = "0.4.0";
-static const char cfish_major_version[] = "0.4.0";
+static const char cfish_major_version[] = "0.4";
static void
S_add_compiler_flags(struct chaz_CLIArgs *args) {
[2/2] git commit: Fix glitches in update_version.
Posted by ma...@apache.org.
Fix glitches in update_version.
This commit will be consolidated into another before merging to master.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/d9f23825
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/d9f23825
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/d9f23825
Branch: refs/heads/prep_0.4.0
Commit: d9f2382539f0ce51c71ddf79ad976c274235b333
Parents: 7059979
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Wed Aug 13 10:13:07 2014 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Aug 13 10:13:07 2014 -0700
----------------------------------------------------------------------
devel/bin/update_version | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d9f23825/devel/bin/update_version
----------------------------------------------------------------------
diff --git a/devel/bin/update_version b/devel/bin/update_version
index 6df87b6..ce1f9a8 100755
--- a/devel/bin/update_version
+++ b/devel/bin/update_version
@@ -48,7 +48,7 @@ for my $path ('runtime/common/charmonizer.c', 'runtime/common/charmonizer.main')
$buf = read_file($path);
$buf =~ s/(cfish_version\[\]\s+=\s+)"[\d.]+"/$1"$x_y_z_version"/
or die "no match";
- $buf =~ s/(cfish_major_version\[\]\s+=\s+)"[\d.]+"/$1"$x_y_z_version"/
+ $buf =~ s/(cfish_major_version\[\]\s+=\s+)"[\d.]+"/$1"$x.$y"/
or die "no match";
write_file($path, $buf);
}
@@ -97,7 +97,7 @@ write_file( 'runtime/c/install.sh', $buf );
# Update compiler/python/setup.py
$buf = read_file('compiler/python/setup.py');
-$buf =~ s/(\bversion\s+=\s+)'[\d.]+'/$1'$x_y_z_version/
+$buf =~ s/(\bversion\s+=\s+)'[\d.]+'/$1'$x_y_z_version'/
or die "no match";
write_file( 'compiler/python/setup.py', $buf );