Bump version to 0.2.3.

egorpugin · egorpugin · commit 6797c79c39e4 · 2017-03-24T22:33:41.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,7 +44,7 @@ project(cppan_client C CXX)
 if (NOT DEFINED VERSION_MAJOR)
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 endif()
 
 # Output directory settings
diff --git a/cppan.yml b/cppan.yml
@@ -40,17 +40,15 @@ projects:
             - src/bazel/.*
             - src/inserts/.*
             - src/support/.*
-            - src/stamp_gen.cpp
-            - src/inserter.cpp
+            - src/gen/.*
 
         exclude_from_package:
             - src/bazel/test/test.cpp
             - src/bazel/.*\.txt
             - src/comments/.*\.txt
 
         exclude_from_build:
-            - src/stamp_gen.cpp
-            - src/inserter.cpp
+            - src/gen/.*
 
         include_directories:
             public:
@@ -86,7 +84,7 @@ projects:
                         - VERSION_PATCH=2
 
         post_sources: |
-            add_executable(stamp_generator ${SDIR}/src/stamp_gen.cpp)
+            add_executable(stamp_generator ${SDIR}/src/gen/stamp_gen.cpp)
             set_property(TARGET stamp_generator PROPERTY FOLDER gen)
             set(stamp ${BDIR}/stamp.h.in)
             # to run every time
@@ -98,7 +96,7 @@ projects:
             set_source_files_properties(${stamp} PROPERTIES GENERATED True)
             set(src ${src} ${stamp})
 
-            add_executable(inserts_generator ${SDIR}/src/inserter.cpp)
+            add_executable(inserts_generator ${SDIR}/src/gen/inserter.cpp)
             set_property(TARGET inserts_generator PROPERTY FOLDER gen)
             target_link_libraries(inserts_generator pvt.egorpugin.primitives.filesystem)
             set(gen
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -21,10 +21,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # inserter
 ########################################
 
-set(inserter_src
-    inserter.cpp
-)
-add_executable(inserter ${inserter_src})
+add_executable(inserter gen/inserter.cpp)
 set_property(TARGET inserter PROPERTY FOLDER gen)
 target_link_libraries(inserter pvt.egorpugin.primitives.filesystem)
 
@@ -67,7 +64,7 @@ add_custom_target(inserts_gen
 set_property(TARGET inserts_gen PROPERTY FOLDER gen)
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/inserts.cpp PROPERTIES GENERATED TRUE)
 
-add_executable(stamp_genenerator stamp_gen.cpp)
+add_executable(stamp_genenerator gen/stamp_gen.cpp)
 set_property(TARGET stamp_genenerator PROPERTY FOLDER gen)
 set(stamp ${CMAKE_CURRENT_BINARY_DIR}/stamp.h.in)
 set_source_files_properties(${stamp} PROPERTIES GENERATED True)
diff --git a/src/gen/inserter.cpp b/src/gen/inserter.cpp
diff --git a/src/gen/stamp_gen.cpp b/src/gen/stamp_gen.cpp
diff --git a/src/support/hash.cpp b/src/support/hash.cpp
@@ -33,10 +33,5 @@ String hash_config(const String &c)
 
 bool check_file_hash(const path &fn, const String &hash)
 {
-    // remove when server will be using strong_file_hash
-    if (hash == sha256(fn))
-        return true;
-    if (hash == strong_file_hash(fn))
-        return true;
-    return false;
+    return hash == strong_file_hash(fn);
 }

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,5 @@ String hash_config(const String &c)`
`33`	`33`
`34`	`34`	`bool check_file_hash(const path &fn, const String &hash)`
`35`	`35`	`{`
`36`		`- // remove when server will be using strong_file_hash`
`37`		`- if (hash == sha256(fn))`
`38`		`- return true;`
`39`		`- if (hash == strong_file_hash(fn))`
`40`		`- return true;`
`41`		`- return false;`
	`36`	`+ return hash == strong_file_hash(fn);`
`42`	`37`	`}`