Browse code

Added build setting srcdir

Nat! authored on 24-06-2017 11:31:17
Showing 5 changed files
... ...
@@ -1,3 +1,7 @@
1
+### 3.8.0
2
+
3
+* new build setting `srcdir` where you can specify the subdirectory, that contains configure, CMakeLists et.c
4
+
1 5
 ### 3.7.2
2 6
 
3 7
 * git fetch exception fixed when mirroring
... ...
@@ -30,8 +30,8 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33
-MULLE_EXECUTABLE_VERSION_MINOR=7
34
-MULLE_EXECUTABLE_VERSION_PATCH=2
33
+MULLE_EXECUTABLE_VERSION_MINOR=8
34
+MULLE_EXECUTABLE_VERSION_PATCH=0
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -2065,11 +2065,14 @@ build()
2065 2065
    log_verbose "Building ${name} ..."
2066 2066
 
2067 2067
    local preferences
2068
-
2068
+   local directory
2069
+   
2069 2070
    #
2070 2071
    # repo may override how it wants to be build
2071 2072
    #
2072 2073
    preferences="`read_build_setting "${name}" "build_preferences"`"
2074
+   directory="`read_build_setting "${name}" "srcdir"`"
2075
+   srcdir="`add_component "${srcdir}" "${directory}"`"
2073 2076
 
2074 2077
    if [ -z "${preferences}" ]
2075 2078
    then
... ...
@@ -949,7 +949,10 @@ git_enable_mirroring()
949 949
 {
950 950
    local allow_refresh="${1:-YES}"
951 951
 
952
-   # stuff clones get intermediate saved too, default is empty
952
+   #
953
+   # stuff clones get intermediate saved too, default is on
954
+   # this is only called in main if the option is yes
955
+   #
953 956
    GIT_MIRROR="`read_config_setting "git_mirror"`"
954 957
    if [ "${allow_refresh}" = "YES" ]
955 958
    then
... ...
@@ -964,6 +967,10 @@ scm_initialize()
964 967
 
965 968
    [ -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ]    && . mulle-bootstrap-functions.sh
966 969
    [ -z "${MULLE_BOOTSTRAP_REPOSITORIES_SH}" ] && . mulle-bootstrap-repositories.sh
970
+
971
+   # this is an actual GIT variable
972
+   GIT_TERMINAL_PROMPT="`read_config_setting "git_terminal_prompt" "0"`"
973
+   export GIT_TERMINAL_PROMPT
967 974
 }
968 975
 
969 976
 scm_initialize
... ...
@@ -163,6 +163,7 @@ CMAKEFLAGS
163 163
 GCC_PREPROCESSOR_DEFINITIONS
164 164
 LD
165 165
 OTHER_CFLAGS
166
+OTHER_CPPFLAGS
166 167
 OTHER_CXXFLAGS
167 168
 OTHER_LDFLAGS
168 169
 build_preferences
... ...
@@ -177,6 +178,7 @@ fallback-configuration
177 178
 final
178 179
 make
179 180
 sdks
181
+srcdir
180 182
 xcconfig
181 183
 xcode_project
182 184
 xcode_proper_skip_install