Feature "minor" environment additions #444
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Resolved conflict in file $HEN_HOUSE/specs/windows.spec due the definition of gui_make. It was set to mingw32-make which is the most likely make utility, but users should not be restricted to MinGW. Using now |
|
Great work, this will save a lot of future hair-pulling! The c++ codes should be run through |
|
Good idea @rtownson ! |
rtownson
approved these changes
Aug 22, 2018
blakewalters
approved these changes
Aug 22, 2018
Add a 'realclean' phony target which removes all objects files and libraries from the dso/config folder that belong to the egs++ library including sources and geometries. Useful when one wants to recompile the full library. The 'clean' target only removes object files in the egs++ folder without cleaning objects for geometries, sources, etc. It is meant to only rebuild the basic part of egs++. Note that libiaea_phsp.so (iaea_phsp.lib on Windows) is preserved. Fix the 'realclean' target for guis as well, to make it general for Linux and Windows and use the proper Makefile name. Also expand the 'clean' rule in the iaea_phsp makefile to remove all object files.
- Call target 'realclean' for egs++ - Build only geometry, shapes and ausgab objects in 'egspp' target: those are the only ones needed for egs_view - Remove iaea_phsp dependency from 'egspp' target - Remove variable 'cleanup' - Add comments
- Add call to 'realclean' egspp - Use 'realclean' for egs_view - Updated output message to reflect library cleaning
ftessier
force-pushed
the
feature-minor-env-additions
branch
from
6e6f196
to
9e00e2d
Compare
- builds only geometry, shapes and ausgab objects as those are the only ones needed for egs_view - Removed iaea_phsp build - Add variable the_config
ftessier
force-pushed
the
feature-minor-env-additions
branch
from
9e00e2d
to
2731d68
Compare
|
The distribution tools were moved to a new admin branch, in which develop can be merged before building distribution files. |
ftessier
approved these changes
Sep 21, 2018
Define the variable the_config in windows makefiles, allowing the use of an existing configuration. Previously, this was hard-coded in the build paths as win-static.
Set the gui_make command name to the make utility used during the configuration, which is available in the configuration file via the variable make_prog.
ftessier
force-pushed
the
feature-minor-env-additions
branch
from
2731d68
to
c9cf98c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request introduces the tool used at NRC to create compressed and uncompressed archives with files to be distributed with the EGSnrc system. Since the move to github it only includes statically built Qt GUIs and required libraries, although in the past it was used to distribute the whole EGSnrc system.
Several fixes were made to make the process as straightforward as possible. However, one still has to build the Windows component on a Windows machine. Here are the fixes: