Skip to content

Commit f026ae4

Browse files
committed
micro: Update to 2.0.13
1 parent c20537a commit f026ae4

File tree

2 files changed

+28
-9
lines changed

2 files changed

+28
-9
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff -urN a/cmd/micro/micro.go b/cmd/micro/micro.go
2+
--- a/cmd/micro/micro.go 2023-10-21 18:35:11.000000000 -0400
3+
+++ b/cmd/micro/micro.go 2024-08-12 14:54:10.000000000 -0400
4+
@@ -99,9 +99,7 @@
5+
6+
if *flagVersion {
7+
// If -version was passed
8+
- fmt.Println("Version:", util.Version)
9+
- fmt.Println("Commit hash:", util.CommitHash)
10+
- fmt.Println("Compiled on", util.CompileDate)
11+
+ fmt.Printf("micro %s (%s)\n", util.Version, util.CompileDate)
12+
os.Exit(0)
13+
}
14+

makefiles/micro.mk

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,39 @@ $(error Use the main Makefile)
33
endif
44

55
SUBPROJECTS += micro
6-
MICRO_VERSION := 2.0.10
6+
MICRO_VERSION := 2.0.13
77
DEB_MICRO_V ?= $(MICRO_VERSION)
88

9+
# NOTE: Generating syntax files for micro on an iOS host doesn't work
10+
# NOTE: Make sure to clear Go's module cache (GOMODCACHE) after
11+
# each build so that syntax highlighting works on supported targets
12+
913
micro-setup: setup
10-
$(call GITHUB_ARCHIVE,zyedidia,micro,$(MICRO_VERSION),v$(MICRO_VERSION),micro)
14+
$(call GITHUB_ARCHIVE,zyedidia,micro,$(MICRO_VERSION),v$(MICRO_VERSION))
1115
$(call EXTRACT_TAR,micro-$(MICRO_VERSION).tar.gz,micro-$(MICRO_VERSION),micro)
12-
mkdir -p $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin
16+
$(call DO_PATCH,micro,micro,-p1)
17+
mkdir -p $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{share/man/man1,bin}
1318

1419
ifneq ($(wildcard $(BUILD_WORK)/micro/.build_complete),)
1520
micro:
1621
@echo "Using previously built micro."
1722
else
1823
micro: micro-setup
1924
$(MAKE) -C $(BUILD_WORK)/micro build \
20-
$(DEFAULT_GOLANG_FLAGS)
21-
$(INSTALL) -Dm755 $(BUILD_WORK)/micro/micro $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/micro
22-
$(INSTALL) -Dm644 $(BUILD_WORK)/micro/assets/packaging/micro.1 $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/micro.1
23-
$(INSTALL) -Dm644 $(BUILD_WORK)/micro/assets/packaging/micro.desktop $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/applications/micro.desktop
25+
$(DEFAULT_GOLANG_FLAGS) \
26+
VERSION="$(MICRO_VERSION)" \
27+
DATE="Procursus"
28+
$(INSTALL) -Dm755 $(BUILD_WORK)/micro/micro $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/
29+
$(INSTALL) -Dm644 $(BUILD_WORK)/micro/assets/packaging/micro.1 $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/
2430
$(call AFTER_BUILD)
2531
endif
2632

2733
micro-package: micro-stage
2834
# micro.mk Package Structure
2935
rm -rf $(BUILD_DIST)/micro
30-
mkdir -p $(BUILD_DIST)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
3136

3237
# micro.mk Prep micro
33-
cp -a $(BUILD_STAGE)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{bin,share} $(BUILD_DIST)/micro/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)
38+
cp -a $(BUILD_STAGE)/micro $(BUILD_DIST)
3439

3540
# micro.mk Sign
3641
$(call SIGN,micro,general.xml)

0 commit comments

Comments
 (0)