Skip to content

Commit d7f3f7b

Browse files
marcschefermarcschefer
authored
Merge pull request #134 from astrorama/develop
Develop
2 parents a02c98c + 12cb50f commit d7f3f7b

File tree

725 files changed

+38476
-5242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

725 files changed

+38476
-5242
lines changed

‎.gitignore‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
/build*
1+
*.AppImage
2+
*.pyc
23
/InstallArea
4+
/build.*
35
/tests
6+
__pycache__
7+
/.cproject
8+
/.project
9+
/.settings/
10+
.pydevproject

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ find_package(ElementsProject)
66
#---------------------------------------------------------------
77

88
# Declare project name and version
9-
elements_project(SExtractorxx 0.1 USE Alexandria 2.9 Elements 5.2.1)
9+
elements_project(SExtractorxx 0.1 USE Alexandria 2.14 Elements 5.8)

‎LICENSE‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎Makefile‎

Lines changed: 10 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
################################################################################
22
#
33
# Generic Makefile to simplify the use of CMake projects
4-
# ------------------------------------------------------
4+
# ------------------------------------------------------
55
#
66
# This simple Makefile is meant to provide a simplified entry point for the
77
# configuration and build of CMake-based projects that use a default toolchain
@@ -14,7 +14,7 @@
1414
#
1515
# all
1616
# (default) build everything
17-
#
17+
#
1818
# test
1919
# run the declared tests
2020
#
@@ -41,127 +41,22 @@
4141
# :Author: Marco Clemencic
4242
# :Author: Hubert Degaudenzi
4343
#
44-
# .. [*] Targets defined by this Makefile.
44+
# .. [*] Targets defined by this Makefile.
4545
#
4646
################################################################################
4747

48-
# settings
49-
CMAKE := cmake
50-
CTEST := ctest
51-
NINJA := $(shell which ninja-build 2> /dev/null)
52-
ifeq ($(NINJA),)
53-
NINJA := $(shell which ninja 2> /dev/null)
54-
endif
55-
56-
57-
# Looking for the ToolChain
58-
59-
TOOLCHAIN_NAME := ElementsToolChain.cmake
48+
ELEMENTS_MAKE_LIB := Elements.mk
6049

61-
ifneq ($(wildcard $(CURDIR)/cmake/$(TOOLCHAIN_NAME)),)
62-
TOOLCHAIN_FILE := $(CURDIR)/cmake/$(TOOLCHAIN_NAME)
50+
ifneq ($(wildcard $(CURDIR)/make/$(ELEMENTS_MAKE_LIB)),)
51+
ELEMENTS_MAKE_LIB_FILE := $(CURDIR)/make/$(ELEMENTS_MAKE_LIB)
6352
else
6453
ifneq ($(CMAKE_PREFIX_PATH),)
6554
PREFIX_LIST := $(subst :, ,$(CMAKE_PREFIX_PATH))
66-
TOOLCHAIN_LIST := $(foreach dir,$(PREFIX_LIST),$(wildcard $(dir)/$(TOOLCHAIN_NAME)))
67-
TOOLCHAIN_FILE := $(firstword $(TOOLCHAIN_LIST))
68-
endif
69-
endif
70-
71-
ifneq ($(TOOLCHAIN_FILE),)
72-
# A toolchain has been found. Lets use it.
73-
override CMAKEFLAGS += -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE)
74-
endif
75-
76-
77-
78-
BUILD_PREFIX_NAME := build
79-
80-
override CMAKEFLAGS += -DUSE_LOCAL_INSTALLAREA=ON -DBUILD_PREFIX_NAME:STRING=$(BUILD_PREFIX_NAME)
81-
82-
ifndef BINARY_TAG
83-
ifdef CMAKECONFIG
84-
BINARY_TAG := ${CMAKECONFIG}
85-
else
86-
ifdef CMTCONFIG
87-
BINARY_TAG := ${CMTCONFIG}
88-
endif
89-
endif
90-
endif
91-
92-
ifdef BINARY_TAG
93-
BUILD_SUBDIR := $(BUILD_PREFIX_NAME).$(BINARY_TAG)
94-
else
95-
BUILD_SUBDIR := $(BUILD_PREFIX_NAME)
96-
endif
97-
BUILDDIR := $(CURDIR)/$(BUILD_SUBDIR)
98-
99-
# build tool
100-
101-
ifneq ($(USE_NINJA),)
102-
# enable Ninja
103-
override CMAKEFLAGS += -GNinja
104-
ifneq ($(VERBOSE),)
105-
NINJAFLAGS := -v $(NINJAFLAGS)
55+
ELEMENTS_MAKE_LIB_LIST := $(foreach dir,$(PREFIX_LIST),$(wildcard $(dir)/share/Elements/make/$(ELEMENTS_MAKE_LIB) $(dir)/../make/$(ELEMENTS_MAKE_LIB)))
10656
endif
107-
BUILD_CONF_FILE := build.ninja
108-
BUILD_CMD := $(NINJA) -C $(BUILD_SUBDIR) $(NINJAFLAGS)
109-
# BUILD_CMD := cd $(BUILD_SUBDIR) && $(NINJA) $(NINJAFLAGS)
110-
else
111-
BUILD_CONF_FILE := Makefile
112-
BUILD_CMD := $(MAKE) -C $(BUILD_SUBDIR)
113-
endif
114-
115-
116-
117-
# default target
118-
all:
119-
120-
# deep clean
121-
purge:
122-
$(RM) -r $(BUILDDIR) $(CURDIR)/InstallArea/$(BINARY_TAG)
123-
find $(CURDIR) -name "*.pyc" -exec $(RM) -v \{} \;
124-
125-
# delegate any target to the build directory (except 'purge')
126-
ifneq ($(MAKECMDGOALS),purge)
127-
%: $(BUILDDIR)/$(BUILD_CONF_FILE) FORCE
128-
+$(BUILD_CMD) $*
57+
ELEMENTS_MAKE_LIB_LIST += /usr/share/Elements/make/$(ELEMENTS_MAKE_LIB)
58+
ELEMENTS_MAKE_LIB_FILE := $(firstword $(ELEMENTS_MAKE_LIB_LIST))
12959
endif
13060

131-
# aliases
132-
.PHONY: configure tests FORCE
133-
ifneq ($(wildcard $(BUILDDIR)/$(BUILD_CONF_FILE)),)
134-
configure: rebuild_cache
135-
else
136-
configure: $(BUILDDIR)/$(BUILD_CONF_FILE)
137-
endif
138-
@ # do not delegate further
139-
140-
141-
# This wrapping around the test target is used to ensure the generation of
142-
# the XML output from ctest.
143-
test: $(BUILDDIR)/$(BUILD_CONF_FILE)
144-
cd $(BUILDDIR) && $(CTEST) -T Test $(ARGS)
145-
146-
147-
# This target ensures that the "all" target is called before
148-
# running the tests (unlike the "test" default target of CMake)
149-
tests: all
150-
-$(BUILD_CMD) test
151-
152-
# ensure that the target are always passed to the CMake Makefile
153-
FORCE:
154-
@ # dummy target
155-
156-
# Makefiles are used as implicit targets in make, but we should not consider
157-
# them for delegation.
158-
$(MAKEFILE_LIST):
159-
@ # do not delegate further
160-
161-
162-
# trigger CMake configuration
163-
$(BUILDDIR)/$(BUILD_CONF_FILE): | $(BUILDDIR)
164-
cd $(BUILDDIR) && $(CMAKE) $(CMAKEFLAGS) $(CURDIR)
61+
include $(ELEMENTS_MAKE_LIB_FILE)
16562

166-
$(BUILDDIR):
167-
mkdir -p $(BUILDDIR)

0 commit comments

Comments
 (0)