Skip to content

Commit a2d52d5

Browse files
end2endzoneend2endzone
committed
Added support for cmake for the project.
Required for issue #9 - Make source code cross-platform
1 parent d3b3ff5 commit a2d52d5

File tree

9 files changed

+311
-1
lines changed

9 files changed

+311
-1
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@
2828
/msvc/TestCLI.testUpdating.actual.txt
2929
/msvc/TestCLI.testUpdatingFile.actual.txt
3030
/msvc/TestCLI.testEncoding.actual.txt
31+
/build

‎run_cmake.bat‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@echo off
2+
set SRC_DIR=%cd%\src
3+
4+
REM Create build directory
5+
REM rmdir /q/s build >NUL 2>NUL
6+
mkdir build >NUL 2>NUL
7+
cd build
8+
9+
cmake -G "Visual Studio 10 2010" %SRC_DIR%
10+
11+
pause

‎src/CMakeLists.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
cmake_minimum_required(VERSION 3.4.3)
2+
project(bin2cpp)
3+
4+
message(STATUS "CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
5+
message(STATUS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}")
6+
message(STATUS "EXECUTABLE_OUTPUT_PATH=${EXECUTABLE_OUTPUT_PATH}")
7+
message(STATUS "LIBRARY_OUTPUT_PATH=${LIBRARY_OUTPUT_PATH}")
8+
message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
9+
10+
# Set the output folder where your program will be created
11+
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/../build)
12+
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
13+
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
14+
15+
add_subdirectory(bin2cpp)
16+
add_subdirectory(bin2cpp_unittest)
17+
add_subdirectory(common)
18+
add_subdirectory(testfilegenerator)
19+
20+
add_dependencies(bin2cpp common)
21+
add_dependencies(testfilegenerator common)
22+
add_dependencies(bin2cpp_unittest common)
23+
add_dependencies(bin2cpp_unittest bin2cpp)
24+
add_dependencies(bin2cpp_unittest testfilegenerator)

‎src/bin2cpp/CMakeLists.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
include_directories(${CMAKE_SOURCE_DIR}/common)
2+
3+
link_directories(${LIBRARY_OUTPUT_PATH})
4+
5+
add_executable(bin2cpp ArrayGenerator.cpp ArrayGenerator.h BaseGenerator.cpp BaseGenerator.h IGenerator.h SegmentGenerator.cpp SegmentGenerator.h StringGenerator.cpp StringGenerator.h targetver.h main.cpp Win32ResourceGenerator.cpp Win32ResourceGenerator.h)
6+
7+
if (WIN32)
8+
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
9+
endif()
10+
11+
target_link_libraries(bin2cpp debug common.lib)
12+
target_link_libraries(bin2cpp optimized common.lib)

‎src/bin2cpp_unittest/CMakeLists.txt‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
include_directories(${CMAKE_SOURCE_DIR}/common)
2+
include_directories(${CMAKE_SOURCE_DIR}/../third_party/googletest/include)
3+
4+
set(GENERATED_TEST_FILES_DIR ${CMAKE_BINARY_DIR}/bin2cpp_unittest/generated_files)
5+
include_directories(${GENERATED_TEST_FILES_DIR})
6+
include_directories(${GENERATED_TEST_FILES_DIR}/..)
7+
8+
link_directories(${LIBRARY_OUTPUT_PATH})
9+
link_directories(${CMAKE_SOURCE_DIR}/../third_party/googletest/msvc2010)
10+
11+
set(GENERATED_TEST_FILES
12+
${GENERATED_TEST_FILES_DIR}/testBaseClass/_testBaseClass.h
13+
${GENERATED_TEST_FILES_DIR}/testBaseClass/_testBaseClass.cpp
14+
${GENERATED_TEST_FILES_DIR}/testEncodingHex/_testEncodingHex.h
15+
${GENERATED_TEST_FILES_DIR}/testEncodingHex/_testEncodingHex.cpp
16+
${GENERATED_TEST_FILES_DIR}/testEncodingOct/_testEncodingOct.h
17+
${GENERATED_TEST_FILES_DIR}/testEncodingOct/_testEncodingOct.cpp
18+
${GENERATED_TEST_FILES_DIR}/testGeneratorArray10000/_testGeneratorArray10000.h
19+
${GENERATED_TEST_FILES_DIR}/testGeneratorArray10000/_testGeneratorArray10000.cpp
20+
${GENERATED_TEST_FILES_DIR}/testGeneratorSegment10000/_testGeneratorSegment10000.h
21+
${GENERATED_TEST_FILES_DIR}/testGeneratorSegment10000/_testGeneratorSegment10000.cpp
22+
${GENERATED_TEST_FILES_DIR}/testGeneratorString10000/_testGeneratorString10000.h
23+
${GENERATED_TEST_FILES_DIR}/testGeneratorString10000/_testGeneratorString10000.cpp
24+
${GENERATED_TEST_FILES_DIR}/testGeneratorWin32/_testGeneratorWin32.h
25+
${GENERATED_TEST_FILES_DIR}/testGeneratorWin32/_testGeneratorWin32.cpp
26+
${GENERATED_TEST_FILES_DIR}/testHtml100000/_testHtml100000.h
27+
${GENERATED_TEST_FILES_DIR}/testHtml100000/_testHtml100000.cpp
28+
${GENERATED_TEST_FILES_DIR}/testIssue12/_testIssue12.h
29+
${GENERATED_TEST_FILES_DIR}/testIssue12/_testIssue12.cpp
30+
${GENERATED_TEST_FILES_DIR}/testIssue12Mini/_testIssue12Mini.h
31+
${GENERATED_TEST_FILES_DIR}/testIssue12Mini/_testIssue12Mini.cpp
32+
${GENERATED_TEST_FILES_DIR}/testIssue13/_testIssue13.h
33+
${GENERATED_TEST_FILES_DIR}/testIssue13/_testIssue13.cpp
34+
${GENERATED_TEST_FILES_DIR}/testNamespace/_testNamespace.h
35+
${GENERATED_TEST_FILES_DIR}/testNamespace/_testNamespace.cpp
36+
${GENERATED_TEST_FILES_DIR}/testRandom1/_testRandom1.h
37+
${GENERATED_TEST_FILES_DIR}/testRandom1/_testRandom1.cpp
38+
${GENERATED_TEST_FILES_DIR}/testRandom2/_testRandom2.h
39+
${GENERATED_TEST_FILES_DIR}/testRandom2/_testRandom2.cpp
40+
${GENERATED_TEST_FILES_DIR}/testRandom3/_testRandom3.h
41+
${GENERATED_TEST_FILES_DIR}/testRandom3/_testRandom3.cpp
42+
${GENERATED_TEST_FILES_DIR}/testRandom4/_testRandom4.h
43+
${GENERATED_TEST_FILES_DIR}/testRandom4/_testRandom4.cpp
44+
${GENERATED_TEST_FILES_DIR}/testRandom5/_testRandom5.h
45+
${GENERATED_TEST_FILES_DIR}/testRandom5/_testRandom5.cpp
46+
${GENERATED_TEST_FILES_DIR}/testRandom6/_testRandom6.h
47+
${GENERATED_TEST_FILES_DIR}/testRandom6/_testRandom6.cpp
48+
${GENERATED_TEST_FILES_DIR}/testRandom7/_testRandom7.h
49+
${GENERATED_TEST_FILES_DIR}/testRandom7/_testRandom7.cpp
50+
${GENERATED_TEST_FILES_DIR}/testRandom8/_testRandom8.h
51+
${GENERATED_TEST_FILES_DIR}/testRandom8/_testRandom8.cpp
52+
${GENERATED_TEST_FILES_DIR}/testSequential1000/_testSequential1000.h
53+
${GENERATED_TEST_FILES_DIR}/testSequential1000/_testSequential1000.cpp
54+
${GENERATED_TEST_FILES_DIR}/testSequential10MB/_testSequential10MB.h
55+
${GENERATED_TEST_FILES_DIR}/testSequential10MB/_testSequential10MB.cpp
56+
${GENERATED_TEST_FILES_DIR}/testText10/_testText10.h
57+
${GENERATED_TEST_FILES_DIR}/testText10/_testText10.cpp
58+
${GENERATED_TEST_FILES_DIR}/testText1000/_testText1000.h
59+
${GENERATED_TEST_FILES_DIR}/testText1000/_testText1000.cpp
60+
${GENERATED_TEST_FILES_DIR}/testText100000/_testText100000.h
61+
${GENERATED_TEST_FILES_DIR}/testText100000/_testText100000.cpp
62+
)
63+
64+
if (WIN32)
65+
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/generate_test_files.bat DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
66+
add_custom_command( OUTPUT ${GENERATED_TEST_FILES}
67+
COMMAND set PATH=${CMAKE_BINARY_DIR}/bin/$(Configuration)\;%PATH%
68+
COMMAND call generate_test_files.bat
69+
)
70+
endif()
71+
72+
add_executable(bin2cpp_unittest application.cpp application.h gtesthelper.cpp gtesthelper.h TestCLI.cpp TestCLI.h TestCommon.cpp TestCommon.h TestExtraction.cpp TestExtraction.h main.cpp ${GENERATED_TEST_FILES})
73+
74+
if (WIN32)
75+
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
76+
endif()
77+
78+
target_link_libraries(bin2cpp_unittest debug common.lib gtest.lib)
79+
target_link_libraries(bin2cpp_unittest optimized common.lib)

‎src/bin2cpp_unittest/generate_test_files.bat‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
@echo off
2+
3+
set TEST_NAME=testText10
4+
set OUTDIR=.\generated_files\%TEST_NAME%
5+
mkdir %OUTDIR% 1>NUL 2>NUL
6+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10 --fill=text
7+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
8+
9+
set TEST_NAME=testText1000
10+
set OUTDIR=.\generated_files\%TEST_NAME%
11+
mkdir %OUTDIR% 1>NUL 2>NUL
12+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=text
13+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
14+
15+
set TEST_NAME=testText100000
16+
set OUTDIR=.\generated_files\%TEST_NAME%
17+
mkdir %OUTDIR% 1>NUL 2>NUL
18+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=text
19+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
20+
21+
set TEST_NAME=testRandom1
22+
set OUTDIR=.\generated_files\%TEST_NAME%
23+
mkdir %OUTDIR% 1>NUL 2>NUL
24+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=1
25+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
26+
27+
set TEST_NAME=testRandom2
28+
set OUTDIR=.\generated_files\%TEST_NAME%
29+
mkdir %OUTDIR% 1>NUL 2>NUL
30+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=2
31+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
32+
33+
set TEST_NAME=testRandom3
34+
set OUTDIR=.\generated_files\%TEST_NAME%
35+
mkdir %OUTDIR% 1>NUL 2>NUL
36+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=3
37+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
38+
39+
set TEST_NAME=testRandom4
40+
set OUTDIR=.\generated_files\%TEST_NAME%
41+
mkdir %OUTDIR% 1>NUL 2>NUL
42+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=4
43+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
44+
45+
set TEST_NAME=testRandom5
46+
set OUTDIR=.\generated_files\%TEST_NAME%
47+
mkdir %OUTDIR% 1>NUL 2>NUL
48+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=5
49+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
50+
51+
set TEST_NAME=testRandom6
52+
set OUTDIR=.\generated_files\%TEST_NAME%
53+
mkdir %OUTDIR% 1>NUL 2>NUL
54+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=6
55+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
56+
57+
set TEST_NAME=testRandom7
58+
set OUTDIR=.\generated_files\%TEST_NAME%
59+
mkdir %OUTDIR% 1>NUL 2>NUL
60+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=7
61+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
62+
63+
set TEST_NAME=testRandom8
64+
set OUTDIR=.\generated_files\%TEST_NAME%
65+
mkdir %OUTDIR% 1>NUL 2>NUL
66+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=8
67+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=200 --override
68+
69+
set TEST_NAME=testHtml100000
70+
set OUTDIR=.\generated_files\%TEST_NAME%
71+
mkdir %OUTDIR% 1>NUL 2>NUL
72+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=html
73+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
74+
75+
set TEST_NAME=testSequential1000
76+
set OUTDIR=.\generated_files\%TEST_NAME%
77+
mkdir %OUTDIR% 1>NUL 2>NUL
78+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=sequential
79+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=180 --override
80+
81+
set TEST_NAME=testSequential10MB
82+
set OUTDIR=.\generated_files\%TEST_NAME%
83+
mkdir %OUTDIR% 1>NUL 2>NUL
84+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10485760 --fill=sequential
85+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
86+
87+
REM set TEST_NAME=testSequential20MB
88+
REM set OUTDIR=.\generated_files\%TEST_NAME%
89+
REM mkdir %OUTDIR% 1>NUL 2>NUL
90+
REM testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=20971520 --fill=sequential
91+
REM bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
92+
REM
93+
REM set TEST_NAME=testSequential30MB
94+
REM set OUTDIR=.\generated_files\%TEST_NAME%
95+
REM mkdir %OUTDIR% 1>NUL 2>NUL
96+
REM testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=31457280 --fill=sequential
97+
REM bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
98+
99+
set TEST_NAME=testGeneratorArray10000
100+
set OUTDIR=.\generated_files\%TEST_NAME%
101+
mkdir %OUTDIR% 1>NUL 2>NUL
102+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
103+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=array --override
104+
105+
set TEST_NAME=testGeneratorString10000
106+
set OUTDIR=.\generated_files\%TEST_NAME%
107+
mkdir %OUTDIR% 1>NUL 2>NUL
108+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
109+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=string --override
110+
111+
set TEST_NAME=testGeneratorSegment10000
112+
set OUTDIR=.\generated_files\%TEST_NAME%
113+
mkdir %OUTDIR% 1>NUL 2>NUL
114+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
115+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=segment --override
116+
117+
set TEST_NAME=testGeneratorWin32
118+
set OUTDIR=.\generated_files\%TEST_NAME%
119+
mkdir %OUTDIR% 1>NUL 2>NUL
120+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
121+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=win32 --override
122+
123+
set TEST_NAME=testNamespace
124+
set OUTDIR=.\generated_files\%TEST_NAME%
125+
mkdir %OUTDIR% 1>NUL 2>NUL
126+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
127+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=segment --override --namespace=foobar
128+
129+
set TEST_NAME=testBaseClass
130+
set OUTDIR=.\generated_files\%TEST_NAME%
131+
mkdir %OUTDIR% 1>NUL 2>NUL
132+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=10000 --fill=sequential
133+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --generator=segment --override --baseclass=Resource
134+
135+
set TEST_NAME=testEncodingOct
136+
set OUTDIR=.\generated_files\%TEST_NAME%
137+
mkdir %OUTDIR% 1>NUL 2>NUL
138+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=300 --fill=sequential
139+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=40 --generator=segment --override --encoding=OcT
140+
141+
set TEST_NAME=testEncodingHex
142+
set OUTDIR=.\generated_files\%TEST_NAME%
143+
mkdir %OUTDIR% 1>NUL 2>NUL
144+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=300 --fill=sequential
145+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=40 --generator=segment --override --encoding=HeX
146+
147+
set TEST_NAME=testIssue12
148+
set OUTDIR=.\generated_files\%TEST_NAME%
149+
mkdir %OUTDIR% 1>NUL 2>NUL
150+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100000 --fill=random --seed=3
151+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=450 --override
152+
153+
set TEST_NAME=testIssue12Mini
154+
set OUTDIR=.\generated_files\%TEST_NAME%
155+
mkdir %OUTDIR% 1>NUL 2>NUL
156+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=100 --fill=random --seed=3 --skip=47240
157+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=10 --override
158+
159+
set TEST_NAME=testIssue13
160+
set OUTDIR=.\generated_files\%TEST_NAME%
161+
mkdir %OUTDIR% 1>NUL 2>NUL
162+
echo testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=1
163+
testfilegenerator.exe --file=%OUTDIR%\%TEST_NAME%.bin --size=1000 --fill=random --seed=1
164+
bin2cpp.exe --noheader --file=%OUTDIR%\%TEST_NAME%.bin --output=%OUTDIR% --headerfile=_%TEST_NAME%.h --identifier=%TEST_NAME% --chunksize=100 --override
165+
166+
dir >NUL

‎src/common/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
add_library(common STATIC argumentparser.cpp argumentparser.h common.cpp common.h cppencoder.cpp cppencoder.h environmentfunc.cpp environmentfunc.h filesystemfunc.cpp filesystemfunc.h logger.cpp logger.h stringfunc.cpp stringfunc.h)
2+
3+
if (WIN32)
4+
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
5+
endif()

‎src/testfilegenerator/CMakeLists.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
include_directories(${CMAKE_SOURCE_DIR}/common)
2+
3+
link_directories(${LIBRARY_OUTPUT_PATH})
4+
5+
add_executable(testfilegenerator testfilegenerator.cpp)
6+
7+
if (WIN32)
8+
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
9+
endif()
10+
11+
target_link_libraries(testfilegenerator debug common.lib)
12+
target_link_libraries(testfilegenerator optimized common.lib)

‎src/testfilegenerator/testfilegenerator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "common.h"
1212
#include "stringfunc.h"
1313
#include "filesystemfunc.h"
14-
#include "..\version_info.h"
14+
#include "..\..\version_info.h"
1515

1616
using namespace bin2cpp;
1717
using namespace stringfunc;

0 commit comments

Comments
 (0)