Explorar el Código

Update generate_version

Scott Lahteine hace 5 años
padre
commit
f69e02ef04
Se han modificado 1 ficheros con 14 adiciones y 1 borrados
  1. 14
    1
      buildroot/bin/generate_version

+ 14
- 1
buildroot/bin/generate_version Ver fichero

@@ -5,7 +5,20 @@
5 5
 # Make a _Version.h file
6 6
 #
7 7
 
8
-DIR="${1}"
8
+DIR=${1:-"Marlin/src/inc"}
9
+
10
+# MRCC3=$( git merge-base HEAD upstream/bugfix-2.0.x 2>/dev/null )
11
+# MRCC2=$( git merge-base HEAD upstream/bugfix-1.1.x 2>/dev/null )
12
+# MRCC1=$( git merge-base HEAD upstream/1.1.x 2>/dev/null )
13
+
14
+# BASE='?'
15
+# if [[ -n $MRCC3 && $MRCC3 != $MRCC2 ]]; then
16
+#   BASE=bugfix-2.0.x
17
+# elif [[ -n $MRCC2 ]]; then
18
+#   BASE=bugfix-1.1.x
19
+# elif [[ -n $MRCC1 ]]; then
20
+#   BASE=1.1.x
21
+# fi
9 22
 
10 23
 BUILDATE=$(date '+%s')
11 24
 DISTDATE=$(date '+%Y-%m-%d %H:%M')

Loading…
Cancelar
Guardar