Skip to content

Commit

Permalink
New release
Browse files Browse the repository at this point in the history
  • Loading branch information
lemire committed Jun 15, 2023
1 parent b399c01 commit 92174c9
Show file tree
Hide file tree
Showing 7 changed files with 151 additions and 75 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
project(
simdjson
# The version number is modified by tools/release.py
VERSION 3.1.8
VERSION 3.2.0
DESCRIPTION "Parsing gigabytes of JSON per second"
HOMEPAGE_URL "https://simdjson.org/"
LANGUAGES CXX C
Expand All @@ -20,8 +20,8 @@ string(
# ---- Options, variables ----

# These version numbers are modified by tools/release.py
set(SIMDJSON_LIB_VERSION "15.0.0" CACHE STRING "simdjson library version")
set(SIMDJSON_LIB_SOVERSION "15" CACHE STRING "simdjson library soversion")
set(SIMDJSON_LIB_VERSION "16.0.0" CACHE STRING "simdjson library version")
set(SIMDJSON_LIB_SOVERSION "16" CACHE STRING "simdjson library soversion")

option(SIMDJSON_ENABLE_THREADS "Link with thread support" ON)

Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.8"
PROJECT_NUMBER = "3.2.0"

# 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
Expand Down
6 changes: 3 additions & 3 deletions include/simdjson/simdjson_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#define SIMDJSON_SIMDJSON_VERSION_H

/** The version of simdjson being used (major.minor.revision) */
#define SIMDJSON_VERSION "3.1.8"
#define SIMDJSON_VERSION "3.2.0"

namespace simdjson {
enum {
Expand All @@ -15,11 +15,11 @@ enum {
/**
* The minor version (major.MINOR.revision) of simdjson being used.
*/
SIMDJSON_VERSION_MINOR = 1,
SIMDJSON_VERSION_MINOR = 2,
/**
* The revision (major.minor.REVISION) of simdjson being used.
*/
SIMDJSON_VERSION_REVISION = 8
SIMDJSON_VERSION_REVISION = 0
};
} // namespace simdjson

Expand Down
3 changes: 2 additions & 1 deletion singleheader/amalgamate.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ def dofile(fid, prepath, filename):
print(f"// redefining SIMDJSON_IMPLEMENTATION to \"{current_implementation}\"\n// {line}", file=fid)
elif undefines_simdjson_implementation.search(line):
# Don't include #undef SIMDJSON_IMPLEMENTATION since we're handling it ourselves
print(f"// {line}")
# print(f"// {line}")
pass
else:
# copy the line, with SIMDJSON_IMPLEMENTATION replace to what it is currently defined to
print(uses_simdjson_implementation.sub(current_implementation+"\\1",line), file=fid)
Expand Down
2 changes: 1 addition & 1 deletion singleheader/simdjson.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* auto-generated on 2023-05-14 17:17:10 -0400. Do not edit! */
/* auto-generated on 2023-06-15 09:11:14 -0400. Do not edit! */
/* begin file src/simdjson.cpp */
#include "simdjson.h"

Expand Down
198 changes: 141 additions & 57 deletions singleheader/simdjson.h

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions tools/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,6 @@ def topaddedversionstring(major, minor, rev):

atleastminor= (currentv[0] != newversion[0]) or (currentv[1] != newversion[1])

if(atleastminor):
print(colored(0, 255, 0, "This is more than a revision."))
releasefile = maindir + os.sep + "RELEASES.md"
releasedata = open(releasefile).read()
pattern = re.compile("#\s+\d+\.\d+")
m = pattern.search(releasedata)
if(m == None):
print(colored(255, 0, 0, "You are preparing a new minor release and you have not yet updated RELEASES.md."))
sys.exit(-1)

versionfilerel = os.sep + "include" + os.sep + "simdjson" + os.sep + "simdjson_version.h"
versionfile = maindir + versionfilerel
Expand Down

0 comments on commit 92174c9

Please sign in to comment.