Ignore:
Timestamp:
Jun 27, 2012, 4:07:21 PM (13 years ago)
Author:
Frederik Heber <heber@…>
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:
edbf88
Parents:
95454a
git-author:
Frederik Heber <heber@…> (02/26/12 20:13:23)
git-committer:
Frederik Heber <heber@…> (06/27/12 16:07:21)
Message:

Restructured convenience libraries for Fragmentation/Automation.

  • new convenience library libFragmentationCommands containing all Operation derived classes.
  • renamed libFragmentationAutomation -> libFragmentationAutomationHelper.
  • FragmentController and CommandRegistry removed from this library.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Fragmentation/Automation/Makefile.am

    r95454a r8d7917  
    4242  $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_IOSTREAMS_LIBS)
    4343
    44 FRAGMENTATIONAUTOMATIONSOURCE = \
    45   atexit.cpp \
    46   Controller/CommandRegistry.cpp \
    47   Controller/FragmentController.cpp \
     44FRAGMENTATIONCOMMANDSSOURCE = \
    4845  Controller/Commands/CheckResultsOperation.cpp \
    4946  Controller/Commands/GetNextJobIdOperation.cpp \
    … …  
    5249  Controller/Commands/SendResultsOperation.cpp \
    5350  Controller/Commands/ShutdownOperation.cpp \
    54   GlobalJobId.cpp
     51  Controller/Commands/WorkOnJobOperation.cpp
    5552
    56 FRAGMENTATIONAUTOMATIONHEADER = \
    57   atexit.hpp \
    58   Connection.hpp \
     53FRAGMENTATIONCOMMANDSHEADER = \
    5954  ControllerChoices.hpp \
    60   Controller/CommandRegistry.hpp \
    61   Controller/FragmentController.hpp \
    6255  Controller/Commands/CheckResultsOperation.hpp \
    6356  Controller/Commands/GetNextJobIdOperation.hpp \
    … …  
    6659  Controller/Commands/SendResultsOperation.hpp \
    6760  Controller/Commands/ShutdownOperation.hpp \
     61  Controller/Commands/WorkOnJobOperation.hpp
     62
     63noinst_LTLIBRARIES += libMolecuilderFragmentationCommands.la
     64libMolecuilderFragmentationCommands_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
     65nobase_libMolecuilderFragmentationCommands_la_include_HEADERS = $(FRAGMENTATIONCOMMANDSHEADER)
     66libMolecuilderFragmentationCommands_la_CXXFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(BOOST_ASIO_DEBUG)
     67libMolecuilderFragmentationCommands_la_SOURCES = $(FRAGMENTATIONCOMMANDSSOURCE)
     68
     69FRAGMENTATIONAUTOMATIONHELPERSOURCE = \
     70  atexit.cpp \
     71  GlobalJobId.cpp
     72
     73FRAGMENTATIONAUTOMATIONHELPERHEADER = \
     74  atexit.hpp \
    6875  GlobalJobId.hpp
    6976
    70 noinst_LTLIBRARIES += libMolecuilderFragmentationAutomation.la
    71 libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
    72 nobase_libMolecuilderFragmentationAutomation_la_include_HEADERS = $(FRAGMENTATIONAUTOMATIONHEADER)
    73 libMolecuilderFragmentationAutomation_la_SOURCES = $(FRAGMENTATIONAUTOMATIONSOURCE)
     77noinst_LTLIBRARIES += libMolecuilderFragmentationAutomationHelper.la
     78libMolecuilderFragmentationAutomationHelper_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Automation/
     79nobase_libMolecuilderFragmentationAutomationHelper_la_include_HEADERS = $(FRAGMENTATIONAUTOMATIONHELPERHEADER)
     80libMolecuilderFragmentationAutomationHelper_la_CXXFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
     81libMolecuilderFragmentationAutomationHelper_la_SOURCES = $(FRAGMENTATIONAUTOMATIONHELPERSOURCE)
    7482
    7583include unittests/Makefile.am
    … …  
    8088bin_PROGRAMS += Controller Server Worker
    8189
    82 CONTROLLERSOURCE =
     90CONTROLLERSOURCE = \
     91  Controller/CommandRegistry.cpp \
     92  Controller/FragmentController.cpp
    8393
    8494CONTROLLERHEADER = \
    85   FragmentController.hpp
     95  Connection.hpp \
     96  Controller/CommandRegistry.hpp \
     97  Controller/FragmentController.hpp
    8698
    8799SERVERSOURCE = \
    … …  
    96108
    97109WORKERSOURCE = \
    98   Controller/Commands/WorkOnJobOperation.cpp \
    99110  FragmentWorker.cpp \
    100111  Worker.cpp
    … …  
    102113WORKERHEADER = \
    103114  Connection.hpp \
    104   Controller/Commands/WorkOnJobOperation.hpp \
    105115  FragmentWorker.hpp
    106116
    … …  
    109119Controller_CXXFLAGS = $(AM_CPPFLAGS)
    110120Controller_LDADD = \
    111   libMolecuilderFragmentationAutomation.la \
     121  libMolecuilderFragmentationAutomationHelper.la \
     122  libMolecuilderFragmentationCommands.la \
    112123  libMolecuilderFragmentJobs.la \
    113124  $(BOOST_ASIO_LIBS) \
    … …  
    121132Server_CXXFLAGS = $(AM_CPPFLAGS)
    122133Server_LDADD = \
    123   libMolecuilderFragmentationAutomation.la \
     134  libMolecuilderFragmentationAutomationHelper.la \
     135  libMolecuilderFragmentationCommands.la \
    124136  libMolecuilderFragmentJobs.la \
    125137  $(BOOST_ASIO_LIBS) \
    … …  
    133145Worker_CXXFLAGS = $(AM_CPPFLAGS)
    134146Worker_LDADD = \
    135   libMolecuilderFragmentationAutomation.la \
     147  libMolecuilderFragmentationAutomationHelper.la \
     148  libMolecuilderFragmentationCommands.la \
    136149  libMolecuilderFragmentJobs.la \
    137150  $(BOOST_ASIO_LIBS) \
Note: See TracChangeset for help on using the changeset viewer.