Skip to content

Commit feadaed

Browse files
committed
Version 1709, Revision 0
1 parent 3466b6e commit feadaed

File tree

302 files changed

+9879
-2640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

302 files changed

+9879
-2640
lines changed

.gitignore

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
## files generated by popular Visual Studio add-ons.
33
# ALox specific
44
.private
5-
.idea
5+
66

77
build/ide.java.eclipse/ALox-Java-1.6-Test/bin.pruned
88
build/ide.java.eclipse/ALox-Java-Android-Test-Release-Log/proguard
99
build/ide.java.eclipse/ALox-Java-Android-Test-Release-Log/gen
1010
build/ide.java.eclipse/ALox-Java-1.6-Test/unittest_testiniFile.cfg*
11-
build/cmake.cpp/cotire.cmake
1211
build/cmake.cpp/unittests/DownloadProject.cmake
1312
build/cmake.cpp/unittests/DownloadProject.CMakeLists.cmake.in
14-
build/_builds_/
13+
build/_builds_
1514
docs/ALox.JAVA/generated/
1615
docs/ALox.CPP/generated/
1716
docs/ALox.CS/generated/
1817
docs/doxygen/dot
1918
docs/doxygenDotFixer.cfg
2019
*.zip
2120
*.userprefs
22-
21+
DownloadProject.*
22+
cotire.cmake
2323

2424
# not yet released
2525
__pycache__
@@ -30,13 +30,17 @@ tools/unreleased
3030
html/
3131

3232

33-
# User-specific files
33+
# Project files
34+
workspace.xml
35+
tasks.xml
3436
*.suo
3537
*.user
3638
*.sln.docstates
3739
*.autosave
40+
.gradle
3841

3942
*.log.txt
43+
local.properties
4044

4145
# Build results
4246

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ALox attempts to make logging as easy and intuitive as possible. We want you to
2323

2424
On the other end of the list, ALox enables **release logging** for productive applications to collect mission critical **metrics from the field**.
2525

26-
This is **Version 1702 Revision 1**.
26+
This is **Version 1709 Revision 0**.
2727

2828
## Features ##
2929

build/cmake.cpp/ALib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# --------------------------------------------------------------------------------------------------
1111
# set cache variables
1212
# --------------------------------------------------------------------------------------------------
13-
set( ALIB_VERSION "1702R1" CACHE STRING
13+
set( ALIB_VERSION "1709R0" CACHE STRING
1414
"The ALib version. Not modifiable (will be overwritten on generation!)" FORCE )
1515

1616
set( temp "${CMAKE_CURRENT_LIST_DIR}/../.." )

build/cmake.cpp/alox.lib/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
# Prior to setting CMake project
1616
# -------------------------------------------------------------------------------------------------
1717

18-
### uncomment to force a certain compiler (delete temporary output folder on change)
19-
#set(CMAKE_C_COMPILER "/usr/bin/clang")
20-
#set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
21-
22-
#set(CMAKE_C_COMPILER "/usr/bin/gcc")
23-
#set(CMAKE_CXX_COMPILER "/usr/bin/g++")
24-
2518
### uncomment to force cotire on clean cmake built
2619
# set( ALIB_CMAKE_COTIRE_DEFAULT "On" )
2720

build/cmake.cpp/alox.samples/CMakeLists.txt

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,8 @@
1515
# Prior to setting CMake project
1616
# -------------------------------------------------------------------------------------------------
1717

18-
### uncomment to force a certain compiler (delete temporary output folder on change)
19-
#set(CMAKE_C_COMPILER "/usr/bin/clang")
20-
#set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
21-
22-
#set(CMAKE_C_COMPILER "/usr/bin/gcc")
23-
#set(CMAKE_CXX_COMPILER "/usr/bin/g++")
24-
2518
### uncomment to force cotire on clean cmake built
26-
#set( ALIB_CMAKE_COTIRE_DEFAULT "On" )
19+
# set( ALIB_CMAKE_COTIRE_DEFAULT "On" )
2720

2821

2922
# -------------------------------------------------------------------------------------------------
@@ -74,20 +67,20 @@
7467
if( ${ALIB_CMAKE_COTIRE} )
7568
set_target_properties( ALoxSamples PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${ALIB_SRC_DIR}/alib/alib.hpp" )
7669
cotire( ALoxSamples )
77-
endif()
7870

79-
#--- dump cotire properties ---
80-
#set ( _dumppname "ALoxSamples" )
81-
#get_target_property( _unitySource ${_dumppname} COTIRE_CXX_UNITY_SOURCE )
82-
#get_target_property( _prefixHeader ${_dumppname} COTIRE_CXX_PREFIX_HEADER )
83-
#get_target_property( _precompiledHeader ${_dumppname} COTIRE_CXX_PRECOMPILED_HEADER)
84-
#get_target_property( _unityTargetName ${_dumppname} COTIRE_UNITY_TARGET_NAME )
85-
86-
# message(STATUS "${_dumppname} unity source: ${_unitySource}")
87-
# message(STATUS "${_dumppname} prefix header: ${_prefixHeader}")
88-
# message(STATUS "${_dumppname} precompiled header: ${_precompiledHeader}")
89-
# message(STATUS "${_dumppname} unity target: ${_unityTargetName}")
71+
#--- dump cotire properties ---
72+
#set ( _dumppname "ALoxSamples" )
73+
#get_target_property( _unitySource ${_dumppname} COTIRE_CXX_UNITY_SOURCE )
74+
#get_target_property( _prefixHeader ${_dumppname} COTIRE_CXX_PREFIX_HEADER )
75+
#get_target_property( _precompiledHeader ${_dumppname} COTIRE_CXX_PRECOMPILED_HEADER)
76+
#get_target_property( _unityTargetName ${_dumppname} COTIRE_UNITY_TARGET_NAME )
77+
78+
# message(STATUS "${_dumppname} unity source: ${_unitySource}")
79+
# message(STATUS "${_dumppname} prefix header: ${_prefixHeader}")
80+
# message(STATUS "${_dumppname} precompiled header: ${_precompiledHeader}")
81+
# message(STATUS "${_dumppname} unity target: ${_unityTargetName}")
9082

83+
endif()
9184

9285
# -------------------------------------------------------------------------------------------------
9386
# End

build/cmake.cpp/unittests/CMakeLists.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
# Prior to setting CMake project
1616
# -------------------------------------------------------------------------------------------------
1717

18-
### uncomment to force a certain compiler (delete temporary output folder on change)
19-
20-
#set(CMAKE_C_COMPILER "/usr/bin/clang")
21-
#set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
22-
23-
#set(CMAKE_C_COMPILER "/usr/bin/gcc")
24-
#set(CMAKE_CXX_COMPILER "/usr/bin/g++")
25-
2618
### uncomment to force cotire on clean cmake built
2719
#set( ALIB_CMAKE_COTIRE_DEFAULT "On" )
2820

@@ -145,8 +137,15 @@
145137
${ALIB_UTESTS_INCS} ${ALOX_UTESTS_INCS}
146138
${ALIB_UTESTS_SRCS} ${ALOX_UTESTS_SRCS} )
147139

148-
set_target_properties ( ALib_ALox_UT PROPERTIES COMPILE_FLAGS
149-
"${AWORX_COMPILE_FLAGS} -Wno-conversion-null" ) # for GTEST
140+
set_target_properties ( ALib_ALox_UT PROPERTIES COMPILE_FLAGS ${AWORX_COMPILE_FLAGS} )
141+
142+
# for GTEST, option available only up to gcc 7.2
143+
if ( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" )
144+
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.2")
145+
set_target_properties ( ALib_ALox_UT PROPERTIES COMPILE_FLAGS "-Wno-gnu-statement-expression" )
146+
endif()
147+
endif()
148+
150149

151150
target_compile_definitions( ALib_ALox_UT PRIVATE ${ALIB_COMPILER_SYMBOLS}
152151
${ALOX_COMPILER_SYMBOLS} )

build/ide.cpp.clion/alox.samples/.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/ide.cpp.clion/alox.samples/.idea/alox.samples.iml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/ide.cpp.clion/alox.samples/.idea/dictionaries/a.xml

Lines changed: 49 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/ide.cpp.clion/alox.samples/.idea/misc.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)