Merge pull request #22 from TarCV/prepare-1.1

Prepare to release 1.1
TarCV · May 3, 2020 · cae3d60 · cae3d60
2 parents dfbcdc6 + 6c3714b
commit cae3d60
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 198 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -81,28 +81,8 @@ jobs:
           paths:
             - output.bin
 
-  publish:
-    docker:
-      - image: cibuilds/github:0.12
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ./artifacts/bin
-      - run:
-          name: "Publish Release on GitHub"
-          command: |
-            VERSION=$(./artifacts/bin/botc --help | cut -c5- | rev | cut -c2- | rev)
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./artifacts/bin/*
-
 workflows:
   version: 2
   build:
     jobs:
       - ubuntu-clang
-      - publish:
-          requires:
-            - ubuntu-clang
-          filters:
-            branches:
-              only:
-                - release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@ get_target_property (UPDATEREVISION_EXE updaterevision LOCATION)
 get_target_property (NAMEDENUMS_EXE namedenums LOCATION)
 
 add_custom_target (revision_check ALL
-    COMMAND ${UPDATEREVISION_EXE} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/hginfo.h
+    COMMAND ${UPDATEREVISION_EXE} ${CMAKE_BINARY_DIR}/gitinfo.h
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     DEPENDS updaterevision)
 

diff --git a/src/macros.h b/src/macros.h
@@ -42,8 +42,8 @@
 // Application name and version
 #define APPNAME "botc"
 #define VERSION_MAJOR	1
-#define VERSION_MINOR	0
-#define VERSION_PATCH 	1
+#define VERSION_MINOR	1
+#define VERSION_PATCH 	0
 
 #define MACRO_TO_STRING_HELPER(A) #A
 #define MACRO_TO_STRING(A) MACRO_TO_STRING_HELPER(A)

diff --git a/src/main.cpp b/src/main.cpp
@@ -37,12 +37,12 @@
 #include "dataBuffer.h"
 #include "parser.h"
 #include "lexer.h"
-#include "hginfo.h"
+#include "gitinfo.h"
 #include "commandline.h"
 #include "enumstrings.h"
 
-#ifdef SVN_REVISION_STRING
-#define FULL_VERSION_STRING VERSION_STRING "-" SVN_REVISION_STRING;
+#ifdef GIT_HASH
+#define FULL_VERSION_STRING VERSION_STRING "-" GIT_HASH;
 #else
 #define FULL_VERSION_STRING VERSION_STRING;
 #endif

diff --git a/src/main.h b/src/main.h
@@ -46,10 +46,6 @@
 #include "botStuff.h"
 #include "tokens.h"
 
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 0
-#define VERSION_PATCH 0
-
 String makeObjectFileName (String s);
 DataType getTypeByName (String token);
 String dataTypeName (DataType type);

diff --git a/updaterevision/updaterevision.c b/updaterevision/updaterevision.c
@@ -1,8 +1,9 @@
 /* updaterevision.c
  *
- * Public domain. This program uses the svnversion command to get the
- * repository revision for a particular directory and writes it into
- * a header file so that it can be used as a project's build number.
+ * Public domain. This program uses git commands command to get
+ * various bits of repository status for a particular directory
+ * and writes it into a header file so that it can be used for a
+ * project's versioning.
  */
 
 #define _CRT_SECURE_NO_DEPRECATE
@@ -12,181 +13,124 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-// [BB] New #includes.
-#include <sys/stat.h>
-#include <time.h>
 
-int main(int argc, char **argv)
+#ifdef _WIN32
+#define popen _popen
+#define pclose _pclose
+#endif
+
+// Used to strip newline characters from lines read by fgets.
+void stripnl(char *str)
 {
-	char *name;
-	char currev[64], lastrev[64], run[256], *rev;
-	unsigned long urev;
-	FILE *stream = NULL;
-	int gotrev = 0, needupdate = 1;
-	// [BB] Are we working with a SVN checkout?
-	int svnCheckout = 0;
-	char hgdateString[64];
-	time_t hgdate = 0;
-	char hgHash[13];
-	hgHash[0] = '\0';
+    if (*str != '\0')
+    {
+        size_t len = strlen(str);
+        if (str[len - 1] == '\n')
+        {
+            str[len - 1] = '\0';
+        }
+    }
+}
 
-	if (argc != 3)
-	{
-		fprintf (stderr, "Usage: %s <repository directory> <path to svnrevision.h>\n", argv[0]);
-		return 1;
-	}
+int main(int argc, char **argv)
+{
+    char vertag[128], lastlog[128], lasthash[128], *hash = NULL;
+    FILE *stream = NULL;
+    int gotrev = 0, needupdate = 1;
 
-	// [BB] Try to figure out whether this is a SVN or a Hg checkout.
-	{
-		struct stat st;
-		char filename[1024];
-		sprintf ( filename, "%s/.svn/entries", argv[1] );
-		if ( stat ( filename, &st ) == 0 )
-			svnCheckout = 1;
-		// [BB] If stat failed we have to manually clear errno, otherwise the code below doesn't work.
-		else
-			errno = 0;
-	}
+    vertag[0] = '\0';
+    lastlog[0] = '\0';
 
-	// Use svnversion to get the revision number. If that fails, pretend it's
-	// revision 0. Note that this requires you have the command-line svn tools installed.
-	// [BB] Depending on whether this is a SVN or Hg checkout we have to use the appropriate tool.
-	if ( svnCheckout )
-		sprintf (run, "svnversion -cn %s", argv[1]);
-	else
-		sprintf (run, "hg identify -n"); 
-	if ((name = tempnam(NULL, "svnout")) != NULL)
-	{
-#ifdef __APPLE__
-		// tempnam will return errno of 2 even though it is successful for our purposes.
-		errno = 0;
-#endif
-		if((stream = freopen(name, "w+b", stdout)) != NULL &&
-		   system(run) == 0 &&
-#ifndef __FreeBSD__
-		   errno == 0 &&
-#endif
-		   fseek(stream, 0, SEEK_SET) == 0 &&
-		   fgets(currev, sizeof currev, stream) == currev &&
-		   (isdigit(currev[0]) || (currev[0] == '-' && currev[1] == '1')))
-		{
-			gotrev = 1;
-			// [BB] Find the date the revision of the working copy was created.
-			if ( ( svnCheckout == 0 ) &&
-				( system("hg log -r. --template \"{date|hgdate} {node|short}\"") == 0 ) &&
-				( fseek(stream, strlen(currev), SEEK_SET) == 0 ) &&
-				( fgets(hgdateString, sizeof ( hgdateString ), stream) == hgdateString ) )
-			{
-				// [BB] Find the hash in the output and store it.
-				char *p = strrchr ( hgdateString, ' ' );
-				strncpy ( hgHash, p ? ( p+1 ) : "hashnotfound" , sizeof( hgHash ) - 1 );
-				hgHash[ sizeof ( hgHash ) - 1 ] = '\0';
-				// [BB] Extract the date from the output and store it.
-				hgdate = atoi ( hgdateString );
-			}
-		}
-	}
-	if (stream != NULL)
-	{
-		fclose (stream);
-		remove (name);
-	}
-	if (name != NULL)
-	{
-		free (name);
-	}
+    if (argc != 2)
+    {
+        fprintf(stderr, "Usage: %s <path to gitinfo.h>\n", argv[0]);
+        return 1;
+    }
 
-	if (!gotrev)
-	{
-		fprintf (stderr, "Failed to get current revision: %s\n", strerror(errno));
-		strcpy (currev, "0");
-		rev = currev;
-	}
-	else
-	{
-		rev = strchr (currev, ':');
-		if (rev == NULL)
-		{
-			rev = currev;
-		}
-		else
-		{
-			rev += 1;
-		}
-	}
+    // Use git describe --tags to get a version string. If we are sitting directly
+    // on a tag, it returns that tag. Otherwise it returns <most recent tag>-<number of
+    // commits since the tag>-<short hash>.
+    // Use git log to get the time of the latest commit in ISO 8601 format and its full hash.
+    stream = popen("git describe --tags && git log -1 --format=%ai*%h", "r");
 
-	// [BB] Create date version string.
-	if ( gotrev && ( svnCheckout == 0 ) )
-	{
-		char *endptr;
-		unsigned long parsedRev = strtoul(rev, &endptr, 10);
-		unsigned int localChanges = ( *endptr == '+' );
-		struct tm	*lt = gmtime( &hgdate );
-		if ( localChanges )
-			sprintf ( rev, "%d%02d%02d-%02d%02dM", lt->tm_year - 100, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min);
-		else
-			sprintf ( rev, "%d%02d%02d-%02d%02d", lt->tm_year - 100, lt->tm_mon + 1, lt->tm_mday, lt->tm_hour, lt->tm_min);
-	}
+    if (NULL != stream)
+    {
+        if (fgets(vertag, sizeof vertag, stream) == vertag &&
+            fgets(lastlog, sizeof lastlog, stream) == lastlog)
+        {
+            stripnl(vertag);
+            stripnl(lastlog);
+            gotrev = 1;
+        }
 
-	stream = fopen (argv[2], "r");
-	if (stream != NULL)
-	{
-		if (!gotrev)
-		{ // If we didn't get a revision but the file does exist, leave it alone.
-			fprintf( stderr, "No revision found.\n" );
-			fclose (stream);
-			return 0;
-		}
-		// Read the revision that's in this file already. If it's the same as
-		// what we've got, then we don't need to modify it and can avoid rebuilding
-		// dependant files.
-		if (fgets(lastrev, sizeof lastrev, stream) == lastrev)
-		{
-			if (lastrev[0] != '\0')
-			{ // Strip trailing \n
-				lastrev[strlen(lastrev) - 1] = '\0';
-			}
-			if (strcmp(rev, lastrev + 3) == 0)
-			{
-				needupdate = 0;
-			}
-		}
-		fclose (stream);
-	}
+        pclose(stream);
+    }
 
-	if (needupdate)
-	{
-		stream = fopen (argv[2], "w");
-		if (stream == NULL)
-		{
-			return 1;
-		}
-		// [BB] Use hgdate as revision number.
-		if ( hgdate )
-			urev = hgdate;
-		else
-			urev = strtoul(rev, NULL, 10);
-		fprintf (stream,
-"// %s\n"
-"//\n"
-"// This file was automatically generated by the\n"
-"// updaterevision tool. Do not edit by hand.\n"
-"\n"
-"#define SVN_REVISION_STRING \"%s\"\n"
-"#define SVN_REVISION_NUMBER %lu\n",
-			rev, rev, urev);
+    if (gotrev)
+    {
+        hash = strchr(lastlog, '*');
+        if (hash != NULL)
+        {
+            *hash = '\0';
+            hash++;
+        }
+    }
+    if (hash == NULL)
+    {
+        fprintf(stderr, "Failed to get commit info: %s\n", strerror(errno));
+        strcpy(vertag, "<unknown version>");
+        lastlog[0] = '\0';
+        lastlog[1] = '0';
+        lastlog[2] = '\0';
+        hash = lastlog + 1;
+    }
 
-		// [BB] Also save the hg hash.
-		if ( svnCheckout == 0 )
-			fprintf (stream, "#define HG_REVISION_HASH_STRING \"%s\"\n", hgHash);
+    stream = fopen (argv[1], "r");
+    if (stream != NULL)
+    {
+        if (!gotrev)
+        { // If we didn't get a revision but the file does exist, leave it alone.
+            fclose (stream);
+            return 0;
+        }
+        // Read the revision that's in this file already. If it's the same as
+        // what we've got, then we don't need to modify it and can avoid rebuilding
+        // dependant files.
+        if (fgets(lasthash, sizeof lasthash, stream) == lasthash)
+        {
+            stripnl(lasthash);
+            if (strcmp(hash, lasthash + 3) == 0)
+            {
+                needupdate = 0;
+            }
+        }
+        fclose (stream);
+    }
 
-		fclose (stream);
-		fprintf (stderr, "%s updated to revision %s.\n", argv[2], rev);
-	}
-	else
-	{
-		fprintf (stderr, "%s is up to date at revision %s.\n", argv[2], rev);
-	}
+    if (needupdate)
+    {
+        stream = fopen (argv[1], "w");
+        if (stream == NULL)
+        {
+            return 1;
+        }
+        fprintf(stream,
+                "// %s\n"
+                "//\n"
+                "// This file was automatically generated by the\n"
+                "// updaterevision tool. Do not edit by hand.\n"
+                "\n"
+                "#define GIT_DESCRIPTION \"%s\"\n"
+                "#define GIT_HASH \"%s\"\n"
+                "#define GIT_TIME \"%s\"\n",
+                hash, vertag, hash, lastlog);
+        fclose(stream);
+        fprintf(stderr, "%s updated to commit %s.\n", argv[1], vertag);
+    }
+    else
+    {
+        fprintf (stderr, "%s is up to date at commit %s.\n", argv[1], vertag);
+    }
 
-	return 0;
+    return 0;
 }