Changeset 796aa6

Timestamp:

Aug 4, 2010, 1:25:25 PM (14 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

90aeb9

Parents:

10d290

Message:

Added faster unity build target to makefiles

• unity build means a single compilation unit is build which is then send to the compiler for compilation
• unity build is for fast recompiles when a lot of compilation units are covered
• see: ​http://buffered.io/2007/12/10/the-magic-of-unity-builds/

Files:

• Makefile.am (modified) (1 diff)
• src/Actions/Makefile.am (modified) (1 diff)
• src/Helpers/Assert.cpp (modified) (1 diff)
• src/Makefile.am (modified) (5 diffs)
• src/UIElements/Makefile.am (modified) (1 diff)

Makefile.am

@@ -7 +7 @@
 doc:
         cd doc && make doxygen-docs
+        
+unity:
+        cd src && make unity

src/Actions/Makefile.am

@@ -168 +168 @@
   WorldAction/SetOutputFormatsAction.hpp               
 
+unity.cpp:
+        echo "" >  unity.cpp; \
+        list='$(ACTIONSSOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done;
+        
+MOSTLYCLEANFILES = unity.cpp

src/Helpers/Assert.cpp

@@ -5 +5 @@
  *      Author: crueger
  */
-
-#include "Helpers/MemDebug.hpp"
 
 #include "Helpers/Assert.hpp"

src/Makefile.am

@@ -194 +194 @@
   ${SHAPESOURCE} \
   ${DESCRIPTORSOURCE} \
-  ${HELPERSOURCE} \
   bond.cpp \
   bondgraph.cpp \
@@ -226 +225 @@
   periodentafel.cpp \
   Plane.cpp \
-  Space.cpp \
   tesselation.cpp \
   tesselationhelpers.cpp \
@@ -295 +293 @@
 noinst_LIBRARIES = libmolecuilderbase.a libmolecuilder.a libgslwrapper.a libmenu.a libparser.a
 bin_PROGRAMS = molecuilder molecuildergui joiner analyzer
+EXTRA_PROGRAMS = unity
 
 molecuilderdir = ${bindir}
@@ -325 +324 @@
 analyzer_SOURCES = analyzer.cpp datacreator.cpp parser.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp 
 analyzer_LDADD = libmolecuilder.a libmolecuilderbase.a $(BOOST_LIB) ${BOOST_THREAD_LIB}
+
+unity_SOURCES = unity.cpp $(srcdir)/version.c
+unity_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
 
 #Rules needed for QT4
@@ -340 +342 @@
         done;
 
-
-
-MOSTLYCLEANFILES = allmocs.moc.cpp
+unity.cpp: ${LINALGSOURCE} ${LINALGHEADER} ${SOURCE} ${HEADER}
+        echo "" >  unity.cpp; \
+        list='$(BASESOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done; \
+        list='$(LINALGSOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done; \
+        list='$(SOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done; \
+        subdirs='$(SUBDIRS)';for directory in $$subdirs; do\
+                olddir=$$PWD;\
+                cd $$directory && make unity.cpp;\
+                cd $$olddir;\
+                echo "#include \"$$directory/unity.cpp\"" >> unity.cpp;\
+        done;\
+        echo "#include \"$(srcdir)/builder.cpp\"" >> unity.cpp;
+
+MOSTLYCLEANFILES = allmocs.moc.cpp unity.cpp 
         
 #EXTRA_DIST = ${molecuilder_DATA}

src/UIElements/Makefile.am

@@ -80 +80 @@
   CommandLineUI/CommandLineWindow.hpp
 
-
+unity.cpp:
+        echo "" >  unity.cpp; \
+        list='$(UISOURCE)'; for file in $$list; do \
+          echo "#include \"$(srcdir)/$$file\"" >> unity.cpp; \
+        done;
+        
+MOSTLYCLEANFILES = unity.cpp