Browse code

change versioning to x.y.z use mulle-project to distribute

Nat! authored on 28-05-2019 23:35:29
Showing 6 changed files
1 1
new file mode 100755
... ...
@@ -0,0 +1,78 @@
1
+#
2
+# For documentation and help see:
3
+#    https://github.com/mulle-sde/mulle-project
4
+#
5
+#
6
+
7
+generate_brew_formula_build()
8
+{
9
+   local project="$1"
10
+   local name="$2"
11
+   local version="$3"
12
+
13
+#   generate_brew_cmake_formula_build
14
+#   generate_brew_configure_formula_build
15
+#   generate_script_brew_formula_build
16
+   generate_xcodebuild_brew_formula_build
17
+}
18
+
19
+
20
+####
21
+#### Example code
22
+####
23
+generate_brew_configure_formula_build()
24
+{
25
+  cat <<EOF
26
+
27
+  def install
28
+    system "./configure", "--disable-debug",
29
+                          "--disable-dependency-tracking",
30
+                          "--disable-silent-rules",
31
+                          "--prefix=#{prefix}"
32
+    system "make", "install"
33
+  end
34
+
35
+  test do
36
+    system "false"
37
+  end
38
+EOF
39
+}
40
+
41
+
42
+generate_brew_cmake_formula_build()
43
+{
44
+  cat <<EOF
45
+
46
+  def install
47
+    system "cmake", ".", *std_cmake_args
48
+    system "make", "install"
49
+  end
50
+
51
+  test do
52
+    system "false"
53
+  end
54
+EOF
55
+}
56
+
57
+
58
+generate_script_brew_formula_build()
59
+{
60
+   cat <<EOF
61
+def install
62
+  system "./bin/installer", "#{prefix}"
63
+end
64
+EOF
65
+}
66
+
67
+
68
+generate_xcodebuild_brew_formula_build()
69
+{
70
+   cat <<EOF
71
+def install
72
+  system "xcodebuild", "-configuration", "Release", "DSTROOT=#{prefix}", "install"
73
+end
74
+EOF
75
+}
76
+
77
+
78
+
0 79
new file mode 120000
... ...
@@ -0,0 +1 @@
1
+../../../../publisher-info.sh
0 2
\ No newline at end of file
1 3
deleted file mode 100755
... ...
@@ -1,150 +0,0 @@
1
-#! /usr/bin/env bash
2
-#
3
-#   Copyright (c) 2017 Nat! - Codeon GmbH
4
-#   All rights reserved.
5
-#
6
-#   Redistribution and use in source and binary forms, with or without
7
-#   modification, are permitted provided that the following conditions are met:
8
-#
9
-#   Redistributions of source code must retain the above copyright notice, this
10
-#   list of conditions and the following disclaimer.
11
-#
12
-#   Redistributions in binary form must reproduce the above copyright notice,
13
-#   this list of conditions and the following disclaimer in the documentation
14
-#   and/or other materials provided with the distribution.
15
-#
16
-#   Neither the name of Mulle kybernetiK nor the names of its contributors
17
-#   may be used to endorse or promote products derived from this software
18
-#   without specific prior written permission.
19
-#
20
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
-#   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
-#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
-#   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24
-#   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
-#   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
-#   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
-#   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
-#   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
-#   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
-#   POSSIBILITY OF SUCH DAMAGE.
31
-#
32
-#
33
-# For documentation and help see:
34
-#    https://github.com/mulle-nat/mulle-homebrew
35
-#
36
-# Run this somewhat like this (for real: remove -n):
37
-#   ./bin/release.sh -v -n --publisher mulle-nat --publisher-tap mulle-kybernetik/software/
38
-#
39
-
40
-#######
41
-# If you are using mulle-build, you don't hafta change anything
42
-#######
43
-
44
-#
45
-# Generate your `def install` `test do` lines here. echo them to stdout.
46
-#
47
-generate_brew_formula_build()
48
-{
49
-   local project="$1"
50
-   local name="$2"
51
-   local version="$3"
52
-
53
-   generate_brew_formula_mulle_build "${project}" "${name}" "${version}"
54
-   generate_brew_formula_mulle_test  "${project}" "${name}" "${version}"
55
-}
56
-
57
-
58
-#
59
-# If you are unhappy with the formula in general, then change
60
-# this function. Print your formula to stdout.
61
-#
62
-generate_brew_formula()
63
-{
64
-#   local project="$1"
65
-#   local name="$2"
66
-#   local version="$3"
67
-#   local dependencies="$4"
68
-#   local builddependencies="$5"
69
-#   local homepage="$6"
70
-#   local desc="$7"
71
-#   local archiveurl="$8"
72
-
73
-   _generate_brew_formula "$@"
74
-}
75
-
76
-
77
-#######
78
-# Ideally changes to the following values are done with the command line
79
-# which makes it easier for forks.
80
-#######
81
-
82
-MULLE_BOOTSTRAP_FAIL_PREFIX="`basename -- $0`"
83
-MULLE_HOMEBREW_VERSION="5.0.1"
84
-
85
-#
86
-# prefer local mulle-homebrew if available
87
-# Do not embed it anymore!
88
-#
89
-if [ -z "`command -v mulle-homebrew-env`" ]
90
-then
91
-   cat <<EOF >&2
92
-mulle-homebrew-env not found in PATH.
93
-Visit the homepage for installation instructions:
94
-   https://github.com/mulle-nat/mulle-homebrew
95
-EOF
96
-   exit 1
97
-fi
98
-
99
-INSTALLED_MULLE_HOMEBREW_VERSION="`mulle-homebrew-env version`" || exit 1
100
-LIBEXEC_DIR="`mulle-homebrew-env libexec-path`" || exit 1
101
-
102
-. "${LIBEXEC_DIR}/mulle-files.sh"       || exit 1
103
-. "${LIBEXEC_DIR}/mulle-homebrew.sh"    || exit 1
104
-. "${LIBEXEC_DIR}/mulle-git.sh"         || exit 1
105
-. "${LIBEXEC_DIR}/mulle-version.sh"     || exit 1
106
-. "${LIBEXEC_DIR}/mulle-environment.sh" || exit 1
107
-
108
-
109
-main()
110
-{
111
-   if [ "${DO_GIT_RELEASE}" != "YES" -a "${DO_GENERATE_FORMULA}" != "YES" ]
112
-   then
113
-      fail "Nothing to do! bin/version-info.sh and bin/formula-info.sh are missing"
114
-   fi
115
-
116
-   if [ "${DO_GIT_RELEASE}" = "YES" ]
117
-   then
118
-     # do the release
119
-      git_main "${BRANCH}" "${ORIGIN}" "${TAG}" "${GITHUB}" || exit 1
120
-   fi
121
-
122
-   if [ "${DO_GENERATE_FORMULA}" != "YES" ]
123
-   then
124
-       return
125
-   fi
126
-
127
-   if [ -z "${PUBLISHER}" ]
128
-   then
129
-      fail "You need to specify a publisher with --publisher (hint: https://github.com/<publisher>)"
130
-   fi
131
-
132
-   if [ -z "${PUBLISHER_TAP}" ]
133
-   then
134
-      fail "You need to specify a publisher tap with --tap (hint: <mulle-kybernetik/software>)"
135
-   fi
136
-
137
-   # generate the formula and push it
138
-   homebrew_main "${PROJECT}" \
139
-                 "${NAME}" \
140
-                 "${VERSION}" \
141
-                 "${DEPENDENCIES}" \
142
-                 "${BUILD_DEPENDENCIES}" \
143
-                 "${HOMEPAGE_URL}" \
144
-                 "${DESC}" \
145
-                 "${ARCHIVE_URL}" \
146
-                 "${HOMEBREW_TAP}" \
147
-                 "${RBFILE}"
148
-}
149
-
150
-main "$@"
... ...
@@ -17,3 +17,4 @@ mulle-sde/vscode-clang;extra
17 17
 mulle-sde/vscode;extra
18 18
 mulle-objc/vscode-clang;extra
19 19
 mulle-sde/sublime-text;extra
20
+mulle-sde/mulle-project;extra
... ...
@@ -2023,7 +2023,7 @@
2023 2023
 			baseConfigurationReference = 413C51611CC284CA00F62468 /* Debug.xcconfig */;
2024 2024
 			buildSettings = {
2025 2025
 				CLANG_WARN_INT_CONVERSION = YES;
2026
-				CURRENT_PROJECT_VERSION = 1858.2;
2026
+				CURRENT_PROJECT_VERSION = 1859.0.0;
2027 2027
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
2028 2028
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
2029 2029
 				GCC_OPTIMIZATION_LEVEL = 0;
... ...
@@ -2055,7 +2055,7 @@
2055 2055
 			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
2056 2056
 			buildSettings = {
2057 2057
 				CLANG_WARN_INT_CONVERSION = YES;
2058
-				CURRENT_PROJECT_VERSION = 1858.2;
2058
+				CURRENT_PROJECT_VERSION = 1859.0.0;
2059 2059
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
2060 2060
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
2061 2061
 				GCC_PREPROCESSOR_DEFINITIONS = (
... ...
@@ -2124,7 +2124,7 @@
2124 2124
 			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
2125 2125
 			buildSettings = {
2126 2126
 				CLANG_WARN_INT_CONVERSION = YES;
2127
-				CURRENT_PROJECT_VERSION = 1858.2;
2127
+				CURRENT_PROJECT_VERSION = 1859.0.0;
2128 2128
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
2129 2129
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
2130 2130
 				GCC_PREPROCESSOR_DEFINITIONS = (
... ...
@@ -1,3 +1,11 @@
1
+# 1859.0.0
2
+
3
+chamged versioning to three digits for mulle-project
4
+
5
+* tested against mulle-objc 0.15
6
+* migration from bootstrap to mulle-sde
7
+
8
+
1 9
 ### 1858.2
2 10
 
3 11
 * adapt to changes in mulle-configuration