Split: Relocate wizards into separate files - Updated build files usi…

…ng bootstrap.bat

git-svn-id: https://svn.code.sf.net/p/moneymanagerex/code/trunk@5728 7f5d68d0-c712-0410-839f-9b116a576cc5

bootstrap.bat

@@ -3,3 +3,4 @@
 cd build/bakefiles
 bakefile_gen %*
 cd ../..
+@pause

build/msw-vc-2013e/mmex_mmex.vcxproj

@@ -336,6 +336,8 @@
     <ClCompile Include="..\..\src\transdialog.cpp" />
     <ClCompile Include="..\..\src\import_export\univcsvdialog.cpp" />
     <ClCompile Include="..\..\src\util.cpp" />
+    <ClCompile Include="..\..\src\wizard_newaccount.cpp" />
+    <ClCompile Include="..\..\src\wizard_newdb.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\customreportdialog.h" />
@@ -445,6 +447,8 @@
     <ClInclude Include="..\..\src\import_export\univcsvdialog.h" />
     <ClInclude Include="..\..\src\util.h" />
     <ClInclude Include="..\..\src\validators.h" />
+    <ClInclude Include="..\..\src\wizard_newaccount.h" />
+    <ClInclude Include="..\..\src\wizard_newdb.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resources\mmex.rc" />

build/msw-vc-2013e/mmex_mmex.vcxproj.filters

@@ -273,6 +273,12 @@
     <ClCompile Include="..\..\src\images_list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\wizard_newdb.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\wizard_newaccount.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\aboutdialog.h">
@@ -596,6 +602,12 @@
     <ClInclude Include="..\..\src\images_list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\wizard_newdb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\wizard_newaccount.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resources\mmex.rc">

build/msw/makefile.gcc

@@ -138,6 +138,8 @@ MMEX_OBJECTS =  \
 	mmex_stockspanel.o \
 	mmex_transdialog.o \
 	mmex_util.o \
+	mmex_wizard_newaccount.o \
+	mmex_wizard_newdb.o \
 	mmex_budget.o \
 	mmex_budgetcategorysummary.o \
 	mmex_budgetingperf.o \
@@ -614,6 +616,12 @@ mmex_transdialog.o: ../../src/transdialog.cpp
 mmex_util.o: ../../src/util.cpp
 	$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
 
+mmex_wizard_newaccount.o: ../../src/wizard_newaccount.cpp
+	$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
+
+mmex_wizard_newdb.o: ../../src/wizard_newdb.cpp
+	$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
+
 mmex_budget.o: ../../src/reports/budget.cpp
 	$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
 

build/msw/makefile.vc

@@ -142,6 +142,8 @@ MMEX_OBJECTS =  \
 	mmex_stockspanel.obj \
 	mmex_transdialog.obj \
 	mmex_util.obj \
+	mmex_wizard_newaccount.obj \
+	mmex_wizard_newdb.obj \
 	mmex_budget.obj \
 	mmex_budgetcategorysummary.obj \
 	mmex_budgetingperf.obj \
@@ -740,6 +742,12 @@ mmex_transdialog.obj: ..\..\src\transdialog.cpp
 mmex_util.obj: ..\..\src\util.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\util.cpp
 
+mmex_wizard_newaccount.obj: ..\..\src\wizard_newaccount.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\wizard_newaccount.cpp
+
+mmex_wizard_newdb.obj: ..\..\src\wizard_newdb.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\wizard_newdb.cpp
+
 mmex_budget.obj: ..\..\src\reports\budget.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\reports\budget.cpp
 

build/msw/mmex_mmex.vcproj

@@ -732,6 +732,14 @@
 				RelativePath="..\..\src\util.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\wizard_newaccount.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wizard_newdb.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1170,6 +1178,14 @@
 				RelativePath="..\..\src\validators.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\wizard_newaccount.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\wizard_newdb.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

build/msw/tests/makefile.gcc

@@ -70,6 +70,58 @@ LUA_OBJECTS =  \
 	lua_lundump.o \
 	lua_lvm.o \
 	lua_lzio.o
+CPPUNIT_CXXFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
+	$(__DEBUG_DEFINE_p) -I..\..\..\lib\cppunit\include $(CPPFLAGS) $(CXXFLAGS)
+CPPUNIT_OBJECTS =  \
+	cppunit_AdditionalMessage.o \
+	cppunit_Asserter.o \
+	cppunit_BeOsDynamicLibraryManager.o \
+	cppunit_BriefTestProgressListener.o \
+	cppunit_CompilerOutputter.o \
+	cppunit_Exception.o \
+	cppunit_Message.o \
+	cppunit_PlugInManager.o \
+	cppunit_PlugInParameters.o \
+	cppunit_Protector.o \
+	cppunit_ProtectorChain.o \
+	cppunit_RepeatedTest.o \
+	cppunit_ShlDynamicLibraryManager.o \
+	cppunit_SourceLine.o \
+	cppunit_StringTools.o \
+	cppunit_SynchronizedObject.o \
+	cppunit_Test.o \
+	cppunit_TestAssert.o \
+	cppunit_TestCase.o \
+	cppunit_TestCaseDecorator.o \
+	cppunit_TestComposite.o \
+	cppunit_TestDecorator.o \
+	cppunit_TestFactoryRegistry.o \
+	cppunit_TestFailure.o \
+	cppunit_TestLeaf.o \
+	cppunit_TestNamer.o \
+	cppunit_TestPath.o \
+	cppunit_TestPlugInDefaultImpl.o \
+	cppunit_TestResult.o \
+	cppunit_TestResultCollector.o \
+	cppunit_TestRunner.o \
+	cppunit_TestSetUp.o \
+	cppunit_TestSuccessListener.o \
+	cppunit_TestSuite.o \
+	cppunit_TestSuiteBuilderContext.o \
+	cppunit_TextOutputter.o \
+	cppunit_TextTestProgressListener.o \
+	cppunit_TextTestResult.o \
+	cppunit_TextTestRunner.o \
+	cppunit_TypeInfoHelper.o \
+	cppunit_UnixDynamicLibraryManager.o \
+	cppunit_Win32DynamicLibraryManager.o \
+	cppunit_XmlDocument.o \
+	cppunit_XmlElement.o \
+	cppunit_XmlOutputter.o \
+	cppunit_XmlOutputterHook.o \
+	cppunit_DefaultProtector.o \
+	cppunit_DynamicLibraryManager.o \
+	cppunit_DynamicLibraryManagerException.o
 MMEX_TESTS_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \
 	$(__WXDEBUG_DEFINE_p) -D__WXMSW__ \
 	-I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -mthreads -W \
@@ -118,6 +170,8 @@ MMEX_TESTS_OBJECTS =  \
 	mmex_tests_stockspanel.o \
 	mmex_tests_transdialog.o \
 	mmex_tests_util.o \
+	mmex_tests_wizard_newaccount.o \
+	mmex_tests_wizard_newdb.o \
 	mmex_tests_budget.o \
 	mmex_tests_budgetcategorysummary.o \
 	mmex_tests_budgetingperf.o \
@@ -320,9 +374,9 @@ liblua.a: $(LUA_OBJECTS)
 	ar rcu $@ $(LUA_OBJECTS)
 	ranlib $@
 
-libcppunit.a: 
+libcppunit.a: $(CPPUNIT_OBJECTS)
 	if exist $@ del $@
-	ar rcu $@
+	ar rcu $@ $(CPPUNIT_OBJECTS)
 	ranlib $@
 
 mmex_tests.exe: $(MMEX_TESTS_OBJECTS) libwxsqlite.a liblua.a libcppunit.a mmex_tests_mmex_tests_rc.o
@@ -439,6 +493,153 @@ lua_lvm.o: ../../../lib/lua/src/lvm.c
 lua_lzio.o: ../../../lib/lua/src/lzio.c
 	$(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $<
 
+cppunit_AdditionalMessage.o: ../../../lib/cppunit/src/cppunit/AdditionalMessage.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_Asserter.o: ../../../lib/cppunit/src/cppunit/Asserter.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_BeOsDynamicLibraryManager.o: ../../../lib/cppunit/src/cppunit/BeOsDynamicLibraryManager.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_BriefTestProgressListener.o: ../../../lib/cppunit/src/cppunit/BriefTestProgressListener.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_CompilerOutputter.o: ../../../lib/cppunit/src/cppunit/CompilerOutputter.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_Exception.o: ../../../lib/cppunit/src/cppunit/Exception.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_Message.o: ../../../lib/cppunit/src/cppunit/Message.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_PlugInManager.o: ../../../lib/cppunit/src/cppunit/PlugInManager.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_PlugInParameters.o: ../../../lib/cppunit/src/cppunit/PlugInParameters.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_Protector.o: ../../../lib/cppunit/src/cppunit/Protector.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_ProtectorChain.o: ../../../lib/cppunit/src/cppunit/ProtectorChain.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_RepeatedTest.o: ../../../lib/cppunit/src/cppunit/RepeatedTest.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_ShlDynamicLibraryManager.o: ../../../lib/cppunit/src/cppunit/ShlDynamicLibraryManager.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_SourceLine.o: ../../../lib/cppunit/src/cppunit/SourceLine.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_StringTools.o: ../../../lib/cppunit/src/cppunit/StringTools.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_SynchronizedObject.o: ../../../lib/cppunit/src/cppunit/SynchronizedObject.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_Test.o: ../../../lib/cppunit/src/cppunit/Test.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestAssert.o: ../../../lib/cppunit/src/cppunit/TestAssert.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestCase.o: ../../../lib/cppunit/src/cppunit/TestCase.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestCaseDecorator.o: ../../../lib/cppunit/src/cppunit/TestCaseDecorator.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestComposite.o: ../../../lib/cppunit/src/cppunit/TestComposite.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestDecorator.o: ../../../lib/cppunit/src/cppunit/TestDecorator.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestFactoryRegistry.o: ../../../lib/cppunit/src/cppunit/TestFactoryRegistry.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestFailure.o: ../../../lib/cppunit/src/cppunit/TestFailure.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestLeaf.o: ../../../lib/cppunit/src/cppunit/TestLeaf.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestNamer.o: ../../../lib/cppunit/src/cppunit/TestNamer.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestPath.o: ../../../lib/cppunit/src/cppunit/TestPath.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestPlugInDefaultImpl.o: ../../../lib/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestResult.o: ../../../lib/cppunit/src/cppunit/TestResult.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestResultCollector.o: ../../../lib/cppunit/src/cppunit/TestResultCollector.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestRunner.o: ../../../lib/cppunit/src/cppunit/TestRunner.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestSetUp.o: ../../../lib/cppunit/src/cppunit/TestSetUp.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestSuccessListener.o: ../../../lib/cppunit/src/cppunit/TestSuccessListener.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestSuite.o: ../../../lib/cppunit/src/cppunit/TestSuite.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TestSuiteBuilderContext.o: ../../../lib/cppunit/src/cppunit/TestSuiteBuilderContext.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TextOutputter.o: ../../../lib/cppunit/src/cppunit/TextOutputter.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TextTestProgressListener.o: ../../../lib/cppunit/src/cppunit/TextTestProgressListener.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TextTestResult.o: ../../../lib/cppunit/src/cppunit/TextTestResult.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TextTestRunner.o: ../../../lib/cppunit/src/cppunit/TextTestRunner.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_TypeInfoHelper.o: ../../../lib/cppunit/src/cppunit/TypeInfoHelper.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_UnixDynamicLibraryManager.o: ../../../lib/cppunit/src/cppunit/UnixDynamicLibraryManager.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_Win32DynamicLibraryManager.o: ../../../lib/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_XmlDocument.o: ../../../lib/cppunit/src/cppunit/XmlDocument.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_XmlElement.o: ../../../lib/cppunit/src/cppunit/XmlElement.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_XmlOutputter.o: ../../../lib/cppunit/src/cppunit/XmlOutputter.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_XmlOutputterHook.o: ../../../lib/cppunit/src/cppunit/XmlOutputterHook.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_DefaultProtector.o: ../../../lib/cppunit/src/cppunit/DefaultProtector.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_DynamicLibraryManager.o: ../../../lib/cppunit/src/cppunit/DynamicLibraryManager.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
+cppunit_DynamicLibraryManagerException.o: ../../../lib/cppunit/src/cppunit/DynamicLibraryManagerException.cpp
+	$(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $<
+
 mmex_tests_aboutdialog.o: ../../../src/aboutdialog.cpp
 	$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
 
@@ -553,6 +754,12 @@ mmex_tests_transdialog.o: ../../../src/transdialog.cpp
 mmex_tests_util.o: ../../../src/util.cpp
 	$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
 
+mmex_tests_wizard_newaccount.o: ../../../src/wizard_newaccount.cpp
+	$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
+
+mmex_tests_wizard_newdb.o: ../../../src/wizard_newdb.cpp
+	$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
+
 mmex_tests_budget.o: ../../../src/reports/budget.cpp
 	$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<