mirror of
https://github.com/simdjson/simdjson
synced 2026-06-08 17:27:07 +00:00
Release
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
|
||||
project(
|
||||
simdjson
|
||||
# The version number is modified by tools/release.py
|
||||
VERSION 3.2.0
|
||||
VERSION 3.2.1
|
||||
DESCRIPTION "Parsing gigabytes of JSON per second"
|
||||
HOMEPAGE_URL "https://simdjson.org/"
|
||||
LANGUAGES CXX C
|
||||
|
||||
@@ -38,7 +38,7 @@ PROJECT_NAME = simdjson
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = "3.2.0"
|
||||
PROJECT_NUMBER = "3.2.1"
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer a
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#define SIMDJSON_SIMDJSON_VERSION_H
|
||||
|
||||
/** The version of simdjson being used (major.minor.revision) */
|
||||
#define SIMDJSON_VERSION "3.2.0"
|
||||
#define SIMDJSON_VERSION "3.2.1"
|
||||
|
||||
namespace simdjson {
|
||||
enum {
|
||||
@@ -19,7 +19,7 @@ enum {
|
||||
/**
|
||||
* The revision (major.minor.REVISION) of simdjson being used.
|
||||
*/
|
||||
SIMDJSON_VERSION_REVISION = 0
|
||||
SIMDJSON_VERSION_REVISION = 1
|
||||
};
|
||||
} // namespace simdjson
|
||||
|
||||
|
||||
@@ -126,8 +126,10 @@ def dofile(fid, prepath, filename):
|
||||
# Forcing it to be UTC is difficult, because it needs to be portable
|
||||
# between gnu date and busybox date.
|
||||
try:
|
||||
timestamp = subprocess.run(['git', 'show', '-s', '--format=%ci', 'HEAD'],
|
||||
stdout=subprocess.PIPE).stdout.decode('utf-8').strip()
|
||||
proc = subprocess.run(['git', 'show', '-s', '--format=%ci', 'HEAD'],
|
||||
stdout=subprocess.PIPE)
|
||||
print("the commandline is {}".format(proc.args))
|
||||
timestamp = proc.stdout.decode('utf-8').strip()
|
||||
except:
|
||||
print("git not found, timestamp based on current time")
|
||||
timestamp = str(datetime.datetime.now())
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* auto-generated on 2023-06-15 09:11:14 -0400. Do not edit! */
|
||||
/* auto-generated on 2023-07-06 21:34:14 -0400. Do not edit! */
|
||||
/* begin file src/simdjson.cpp */
|
||||
#include "simdjson.h"
|
||||
|
||||
|
||||
+317
-305
File diff suppressed because it is too large
Load Diff
+10
-3
@@ -23,8 +23,9 @@ def toversionstring(major, minor, rev):
|
||||
|
||||
def topaddedversionstring(major, minor, rev):
|
||||
return str(major)+str(minor).zfill(3)+str(rev).zfill(3)
|
||||
|
||||
print("Calling git rev-parse --abbrev-ref HEAD")
|
||||
pipe = subprocess.Popen(["git", "rev-parse", "--abbrev-ref", "HEAD"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
print("the commandline is {}".format(pipe.args))
|
||||
branchresult = pipe.communicate()[0].decode().strip()
|
||||
|
||||
if(branchresult != "master"):
|
||||
@@ -34,8 +35,9 @@ ret = subprocess.call(["git", "remote", "update"])
|
||||
|
||||
if(ret != 0):
|
||||
sys.exit(ret)
|
||||
|
||||
print("Calling git log HEAD.. --oneline")
|
||||
pipe = subprocess.Popen(["git", "log", "HEAD..", "--oneline"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
print("the commandline is {}".format(pipe.args))
|
||||
uptodateresult = pipe.communicate()[0].decode().strip()
|
||||
|
||||
if(len(uptodateresult) != 0):
|
||||
@@ -151,12 +153,17 @@ for line in fileinput.input(doxyfile, inplace=1, backup='.bak'):
|
||||
print("modified "+doxyfile+", a backup was made")
|
||||
|
||||
|
||||
print("running amalgamate.py")
|
||||
cp = subprocess.run(["python3", maindir+ os.sep + "singleheader/amalgamate.py"], stdout=subprocess.DEVNULL) # doesn't capture output
|
||||
print("the commandline is {}".format(cp.args))
|
||||
|
||||
cp = subprocess.run(["python3", "amalgamate.py"], stdout=subprocess.DEVNULL, cwd=maindir+ os.sep + "singleheader") # doesn't capture output
|
||||
if(cp.returncode != 0):
|
||||
print("Failed to run amalgamate")
|
||||
|
||||
print("running doxygen")
|
||||
cp = subprocess.run(["doxygen"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=maindir) # doesn't capture output
|
||||
print("the commandline is {}".format(cp.args))
|
||||
|
||||
if(cp.returncode != 0):
|
||||
print("Failed to run doxygen")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user