From 40138fb53b10e3cbcf2a791eb8e52aaf8f86191e Mon Sep 17 00:00:00 2001
From: Alex Nuijten <alexnuijten@gmail.com>
Date: Fri, 3 Jul 2015 18:17:29 +0200
Subject: [PATCH 1/3] version split into major, minor, patch and beta

---
 build/build.sh             | 17 ++++++++++++++++-
 source/packages/logger.pks | 15 +++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/build/build.sh b/build/build.sh
index 214cfbc..c1a4f94 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -167,7 +167,22 @@ chmod 777 $RELEASE_FOLDER/*.*
 
 #Replace any references for the version number
 sed -i.del "s/x\.x\.x/$VERSION_NUMBER/g" $RELEASE_FOLDER/logger_install.sql
-sed -i.del "s/x\.x\.x/$VERSION_NUMBER/g" $RELEASE_FOLDER/logger.pks
+
+# Orginial:
+# sed -i.del "s/x\.x\.x/$VERSION_NUMBER/g" $RELEASE_FOLDER/logger.pks
+#Change the version number to the individual components
+echo $VERSION_NUMBER | while IFS=. read major minor patch beta
+do
+   #Replace major version
+   sed -i.del "s/-91/$major/g" $RELEASE_FOLDER/logger.pks
+   #Replace minor version
+   sed -i.del "s/-92/$minor/g" $RELEASE_FOLDER/logger.pks
+   #Replace patch version
+   sed -i.del "s/-93/$patch/g" $RELEASE_FOLDER/logger.pks
+   #Replace #beta# version
+   sed -i.del "s/#beta#/$beta/g" $RELEASE_FOLDER/logger.pks
+done
+
 #need to remove the backup file required for sed call
 rm -rf $RELEASE_FOLDER/*.del
 
diff --git a/source/packages/logger.pks b/source/packages/logger.pks
index 56a63cf..5e0e82a 100644
--- a/source/packages/logger.pks
+++ b/source/packages/logger.pks
@@ -40,8 +40,19 @@ as
 
 
   -- VARIABLES
-	g_logger_version constant varchar2(10) := 'x.x.x'; -- Don't change this. Build script will replace with right version number
-	g_context_name constant varchar2(35) := substr(sys_context('USERENV','CURRENT_SCHEMA'),1,23)||'_LOGCTX';
+  g_major_version constant pls_integer := -91;
+  g_minor_version constant pls_integer := -92;
+  g_patch_version constant pls_integer := -93;
+  g_beta_version constant varchar2(10) := '#beta#';
+  g_logger_version constant varchar2(20) :=
+     g_major_version||'.'||
+     g_minor_version||'.'||
+     g_patch_version||
+     case when g_beta_version is not null
+     then '_'||g_beta_version
+     end;
+  -- g_logger_version constant varchar2(10) := 'x.x.x'; -- Don't change this. Build script will replace with right version number
+  g_context_name constant varchar2(35) := substr(sys_context('USERENV','CURRENT_SCHEMA'),1,23)||'_LOGCTX';
 
   g_off constant number := 0;
   g_permanent constant number := 1;

From 2170a0014ab59873ee6aab0b7e8fd8778a7a38bc Mon Sep 17 00:00:00 2001
From: Alex Nuijten <alexnuijten@gmail.com>
Date: Fri, 3 Jul 2015 18:26:57 +0200
Subject: [PATCH 2/3] Add correct Issue number

---
 build/build.sh             | 2 +-
 source/packages/logger.pks | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/build.sh b/build/build.sh
index c1a4f94..bf8227f 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -170,7 +170,7 @@ sed -i.del "s/x\.x\.x/$VERSION_NUMBER/g" $RELEASE_FOLDER/logger_install.sql
 
 # Orginial:
 # sed -i.del "s/x\.x\.x/$VERSION_NUMBER/g" $RELEASE_FOLDER/logger.pks
-#Change the version number to the individual components
+# #129: Change the version number to the individual components
 echo $VERSION_NUMBER | while IFS=. read major minor patch beta
 do
    #Replace major version
diff --git a/source/packages/logger.pks b/source/packages/logger.pks
index 5e0e82a..cef407b 100644
--- a/source/packages/logger.pks
+++ b/source/packages/logger.pks
@@ -40,6 +40,9 @@ as
 
 
   -- VARIABLES
+  -- #129
+  -- Don't change the version number. Build script will
+  -- set the right version number
   g_major_version constant pls_integer := -91;
   g_minor_version constant pls_integer := -92;
   g_patch_version constant pls_integer := -93;

From 95d89f08e617bf8d7679ddeffaf94c75928b56ba Mon Sep 17 00:00:00 2001
From: Alex Nuijten <alexnuijten@gmail.com>
Date: Sun, 5 Jul 2015 13:55:48 +0200
Subject: [PATCH 3/3] logger_install.sql now also gets the correct breakdown of
 version numbers

---
 build/build.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/build.sh b/build/build.sh
index 3780790..45e6e31 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -189,12 +189,16 @@ echo $VERSION_NUMBER | while IFS=. read major minor patch beta
 do
    #Replace major version
    sed -i.del "s/-91/$major/g" $RELEASE_FOLDER/logger.pks
+   sed -i.del "s/-91/$major/g" $RELEASE_FOLDER/logger_install.sql
    #Replace minor version
    sed -i.del "s/-92/$minor/g" $RELEASE_FOLDER/logger.pks
+   sed -i.del "s/-92/$minor/g" $RELEASE_FOLDER/logger_install.sql
    #Replace patch version
    sed -i.del "s/-93/$patch/g" $RELEASE_FOLDER/logger.pks
+   sed -i.del "s/-93/$patch/g" $RELEASE_FOLDER/logger_install.sql
    #Replace #beta# version
    sed -i.del "s/#beta#/$beta/g" $RELEASE_FOLDER/logger.pks
+   sed -i.del "s/#beta#/$beta/g" $RELEASE_FOLDER/logger_install.sql
 done
 
 #need to remove the backup file required for sed call