Browse code

Don't specify dependencies in formula, as this installs a brew cmake, which may not be desired. (brew cmake, has dependencies like openssl...) Up the version to 3.1.2

Nat! authored on 01-04-2017 17:11:29
Showing 32 changed files
... ...
@@ -52,13 +52,6 @@ class ${PROJECT} < Formula
52 52
   version "${VERSION}"
53 53
   sha256 "${HASH}"
54 54
 
55
-  depends_on :git  => :run
56
-  depends_on :curl => :run
57
-  depends_on :bash => :run
58
-
59
-# we can live w/o cmake though
60
-  depends_on :cmake => :run
61
-
62 55
   def install
63 56
      system "./install.sh", "#{prefix}"
64 57
   end
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_EXECUTABLE_VERSION_MAJOR=3
32 32
 MULLE_EXECUTABLE_VERSION_MINOR=1
33
-MULLE_EXECUTABLE_VERSION_PATCH=2
33
+MULLE_EXECUTABLE_VERSION_PATCH=3
34 34
 
35 35
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
36 36
 
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_EXECUTABLE_VERSION_MAJOR=3
32 32
 MULLE_EXECUTABLE_VERSION_MINOR=1
33
-MULLE_EXECUTABLE_VERSION_PATCH=2
33
+MULLE_EXECUTABLE_VERSION_PATCH=3
34 34
 
35 35
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
36 36
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2016 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 MULLE_BOOTSTRAP_AUTO_UPDATE_SH="included"
32 33
 
33 34
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 MULLE_BOOTSTRAP_BREW_SH="included"
32 33
 
33 34
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -27,6 +27,7 @@
27 27
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 28
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 29
 #   POSSIBILITY OF SUCH DAMAGE.
30
+#
30 31
 MULLE_BOOTSTRAP_BUILD_SH="included"
31 32
 
32 33
 
... ...
@@ -427,210 +428,6 @@ build_log_name()
427 428
 }
428 429
 
429 430
 
430
-verify_binary()
431
-{
432
-   local toolname
433
-   local toolfamily
434
-   local tooldefaultname
435
-
436
-   toolname="$1"
437
-   toolfamily="$2"
438
-   tooldefaultname="$3"
439
-
440
-   [ -z "${toolname}" ] && internal_fail "toolname for \"${toolfamily}\" is empty"
441
-
442
-   local path
443
-
444
-   path=`which_binary "${toolname}"`
445
-   if [ ! -z "${path}" ]
446
-   then
447
-      echo "${toolname}"
448
-      return 0
449
-   fi
450
-
451
-   #
452
-   # if user specified a certain tool, then it not being there is bad
453
-   # otherwise it's maybe OK (f.e. only using xcodebuild not cmake)
454
-   #
455
-   toolname="`extension_less_basename "${toolname}"`"
456
-   tooldefaultname="`extension_less_basename "${tooldefaultname}"`"
457
-
458
-   if [ "${toolname}" != "${tooldefaultname}" ]
459
-   then
460
-      fail "${toolname} not found in PATH"
461
-   else
462
-      log_fluff "${toolname} not found in PATH"
463
-   fi
464
-
465
-   return
466
-}
467
-
468
-
469
-assert_binary()
470
-{
471
-   local toolname
472
-   local toolfamily
473
-
474
-   toolname="$1"
475
-   toolfamily="$2"
476
-
477
-   [ -z "${toolname}" ] && internal_fail "toolname for \"${toolfamily}\" is empty"
478
-
479
-   local path
480
-
481
-   path=`which_binary "${toolname}"`
482
-   if [ -z "${path}" ]
483
-   then
484
-      which_binary "${toolname}"
485
-      fail "${toolname} is an unknown build tool (PATH=$PATH)"
486
-   fi
487
-   # echo "$path"
488
-}
489
-
490
-
491
-find_cmake()
492
-{
493
-   local name
494
-
495
-   name="$1"
496
-
497
-   local toolname
498
-
499
-   toolname=`read_build_setting "${name}" "cmake" "cmake"`
500
-   verify_binary "${toolname}" "cmake" "cmake"
501
-}
502
-
503
-
504
-find_make()
505
-{
506
-   local name
507
-
508
-   name="$1"
509
-
510
-   local toolname
511
-   local defaultname
512
-
513
-   defaultname="${2:-make}"
514
-   toolname=`read_build_setting "${name}" "make" "${defaultname}"`
515
-   verify_binary "${toolname}" "make" "${defaultname}"
516
-}
517
-
518
-
519
-find_compiler()
520
-{
521
-   local compiler_name
522
-   local srcdir
523
-   local name
524
-
525
-   name="$1"
526
-   srcdir="$2"
527
-   compiler_name="$3"
528
-
529
-   local compiler
530
-   local filename
531
-
532
-   compiler="`read_build_setting "${name}" "${compiler_name}"`"
533
-   if [ -z "${compiler}" ]
534
-   then
535
-      filename="${srcdir}/.${compiler_name}"
536
-      compiler="`cat "${filename}" 2>/dev/null`"
537
-      if [  ! -z "${compiler}" ]
538
-      then
539
-         log_verbose "Compiler ${C_RESET_BOLD}${compiler_name}${C_VERBOSE} set to ${C_MAGENTA}${C_BOLD}${compiler}${C_VERBOSE} found in \"${filename}\""
540
-      fi
541
-   fi
542
-
543
-   case "${UNAME}" in
544
-      mingw)
545
-         if [ "`read_config_setting "mangle_minwg_compiler" "YES"`" = "YES" ]
546
-         then
547
-            compiler="`mingw_mangle_compiler "${compiler}"`"
548
-         fi
549
-      ;;
550
-   esac
551
-
552
-   if [ ! -z "${compiler}" ]
553
-   then
554
-      assert_binary "${compiler}" "${compiler_name}"
555
-   fi
556
-   echo "`basename -- "${compiler}"`"
557
-}
558
-
559
-
560
-find_xcodebuild()
561
-{
562
-   local name
563
-
564
-   name="$1"
565
-
566
-   local toolname
567
-
568
-   toolname=`read_build_setting "${name}" "xcodebuild" "xcodebuild"`
569
-   verify_binary "${toolname}" "xcodebuild" "xcodebuild"
570
-}
571
-
572
-
573
-tools_environment()
574
-{
575
-   local name
576
-   local srcdir
577
-
578
-   name="$1"
579
-   srcdir="$2"
580
-
581
-   # no problem if those are empty
582
-   C_COMPILER="`find_compiler "${name}" "${srcdir}" CC`"
583
-   CXX_COMPILER="`find_compiler "${name}" "${srcdir}" CXX`"
584
-
585
-   local defaultgenerator
586
-   local defaultmake
587
-
588
-   case "${UNAME}" in
589
-      mingw)
590
-         case "${C_COMPILER}" in
591
-            ""|cl|cl.exe)
592
-               defaultmake="nmake"
593
-            ;;
594
-            *)
595
-               defaultmake="mingw32-make"
596
-            ;;
597
-         esac
598
-
599
-         MAKE="`find_make "${name}" "${defaultmake}"`"
600
-         case "${MAKE}" in
601
-            n*|N*)
602
-               defaultgenerator="NMake Makefiles"
603
-            ;;
604
-            mingw*|MINGW*)
605
-               defaultgenerator="MinGW Makefiles"
606
-            ;;
607
-            *)
608
-               defaultgenerator="MSYS Makefiles"
609
-            ;;
610
-         esac
611
-
612
-         CMAKE="`find_cmake "${name}"`"
613
-         # default use mingw32-make
614
-         # except if the settings specify otherwise
615
-      ;;
616
-
617
-      darwin)
618
-         XCODEBUILD="`find_xcodebuild "${name}"`"
619
-         defaultgenerator="Unix Makefiles"
620
-         MAKE="`find_make "${name}"`"
621
-         CMAKE="`find_cmake "${name}"`"
622
-      ;;
623
-
624
-      *)
625
-         defaultgenerator="Unix Makefiles"
626
-         MAKE="`find_make "${name}"`"
627
-         CMAKE="`find_cmake "${name}"`"
628
-      ;;
629
-   esac
630
-
631
-   CMAKE_GENERATOR="`read_build_setting "${name}" "cmake_generator" "${defaultgenerator}"`"
632
-}
633
-
634 431
 
635 432
 _build_flags()
636 433
 {
... ...
@@ -2372,6 +2169,7 @@ build_main()
2372 2169
 
2373 2170
    build_complete_environment
2374 2171
 
2172
+   [ -z "${MULLE_BOOTSTRAP_COMMAND_SH}" ] && . mulle-bootstrap-command.sh
2375 2173
    [ -z "${MULLE_BOOTSTRAP_GCC_SH}" ] && . mulle-bootstrap-gcc.sh
2376 2174
    [ -z "${MULLE_BOOTSTRAP_REPOSITORIES_SH}" ] && . mulle-bootstrap-repositories.sh
2377 2175
    [ -z "${MULLE_BOOTSTRAP_SCRIPTS_SH}" ] && . mulle-bootstrap-scripts.sh
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2017 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -87,7 +87,7 @@ _unarchive_files()
87 87
    local noclobber="$2"
88 88
 
89 89
    [ -d "${dstdir}" ] || fail "${dstdir} does not exist"
90
-   
90
+
91 91
    (
92 92
       exekutor cd "${dstdir}" ;
93 93
       if [ "${noclobber}" = "NO" ]
... ...
@@ -96,8 +96,8 @@ _unarchive_files()
96 96
       else
97 97
          exekutor tar -x ${TARFLAGS} -k -f -
98 98
       fi
99
-      :  # ignore trashy tar rval 
100
-   )  2> /dev/null 
99
+      :  # ignore trashy tar rval
100
+   )  2> /dev/null
101 101
 }
102 102
 
103 103
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2017 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2016 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -29,7 +29,6 @@
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 #
32
-#
33 32
 MULLE_BOOTSTRAP_DEPENDENCY_RESOLVE_SH="included"
34 33
 
35 34
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 
32 33
 MULLE_BOOTSTRAP_FETCH_SH="included"
33 34
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 
32 33
 [ ! -z "${MULLE_BOOTSTRAP_FUNCTIONS_SH}" ] && echo "double inclusion of functions" >&2 && exit 1
33 34
 MULLE_BOOTSTRAP_FUNCTIONS_SH="included"
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 MULLE_BOOTSTRAP_INIT_SH="included"
32 33
 
33 34
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 
32 33
 MULLE_BOOTSTRAP_INSTALL_SH="included"
33 34
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2017 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 MULLE_BOOTSTRAP_PATHS_SH="included"
32 33
 
33 34
 paths_usage()
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2017 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2016 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 MULLE_BOOTSTRAP_SETTINGS_SH="included"
32 33
 
33 34
 
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2017 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2017 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 MULLE_BOOTSTRAP_TAG_SH="included"
32 33
 
33 34
 
... ...
@@ -1,5 +1,4 @@
1
-#! /bin/sh
2
-#
1
+#! /usr/bin/env bash
3 2
 #
4 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
5 4
 #   All rights reserved.
... ...
@@ -29,6 +28,7 @@
29 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
32 32
 MULLE_BOOTSTRAP_WARN_SCRIPTS_SH="included"
33 33
 
34 34
 
... ...
@@ -1,4 +1,5 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2
+#
2 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
3 4
 #   All rights reserved.
4 5
 #
... ...
@@ -1,4 +1,4 @@
1
-#! /bin/sh
1
+#! /usr/bin/env bash
2 2
 #
3 3
 #   Copyright (c) 2015 Nat! - Mulle kybernetiK
4 4
 #   All rights reserved.
... ...
@@ -28,6 +28,7 @@
28 28
 #   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31
+#
31 32
 MULLE_BOOTSTRAP_ZOMBIFY_SH="included"
32 33
 
33 34