Skip to content

Commit 33f941e

Browse files
qvacuaqvacua
committed
Move third party scripts to bin and add an action for building deps
1 parent a511ca6 commit 33f941e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+72
-8685
lines changed

‎.github/workflows/vimr-deps-release-on-tag.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: "VimR deps release on tag"
2+
on:
3+
push:
4+
branches:
5+
- scripts
6+
tags:
7+
- 'vimr-deps-*'
8+
9+
jobs:
10+
Build-universal:
11+
runs-on: macos-11
12+
steps:
13+
- uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0
16+
- name: Install brew packages
17+
run: |
18+
brew install automake coreutils pyenv pyenv-virtualenv
19+
- name: Set up Python env
20+
run: |
21+
pyenv install 3.9.7
22+
pyenv virtualenv 3.9.7 com.qvacua.VimR.third-party
23+
24+
export PYENV_ROOT="$HOME/.pyenv"
25+
export PATH="$PYENV_ROOT/bin:$PATH"
26+
eval "$(pyenv init --path)"
27+
eval "$(pyenv init -)"
28+
29+
pip install -r requirements.txt
30+
python setup.py develop
31+
- name: Build deps
32+
run: |
33+
./bin/build_deps.sh
34+
- uses: actions/upload-artifact@v2
35+
with:
36+
name: vimr-deps
37+
path: bin/third_party/vimr-deps
38+
if-no-files-found: error
39+
retention-days: 1

‎VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimR.xcscheme

+4-40
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
43
version = "1.3">
5-
<BuildAction
6-
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
4+
<BuildAction>
85
<BuildActionEntries>
96
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
7+
buildForRunning = "YES">
158
<BuildableReference
169
BuildableIdentifier = "primary"
1710
BlueprintIdentifier = "4BEBA5041CFF374B00673FDF"
@@ -22,26 +15,11 @@
2215
</BuildActionEntry>
2316
</BuildActionEntries>
2417
</BuildAction>
25-
<TestAction
26-
buildConfiguration = "Debug"
27-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
32-
</TestAction>
3318
<LaunchAction
34-
buildConfiguration = "Debug"
35-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37-
launchStyle = "0"
3819
useCustomWorkingDirectory = "NO"
39-
ignoresPersistentStateOnLaunch = "NO"
40-
debugDocumentVersioning = "YES"
41-
debugServiceExtension = "internal"
20+
buildConfiguration = "Debug"
4221
allowLocationSimulation = "YES">
43-
<BuildableProductRunnable
44-
runnableDebuggingMode = "0">
22+
<BuildableProductRunnable>
4523
<BuildableReference
4624
BuildableIdentifier = "primary"
4725
BlueprintIdentifier = "4BEBA5041CFF374B00673FDF"
@@ -51,18 +29,4 @@
5129
</BuildableReference>
5230
</BuildableProductRunnable>
5331
</LaunchAction>
54-
<ProfileAction
55-
buildConfiguration = "Release"
56-
shouldUseLaunchSchemeArgsEnv = "YES"
57-
savedToolIdentifier = ""
58-
useCustomWorkingDirectory = "NO"
59-
debugDocumentVersioning = "YES">
60-
</ProfileAction>
61-
<AnalyzeAction
62-
buildConfiguration = "Debug">
63-
</AnalyzeAction>
64-
<ArchiveAction
65-
buildConfiguration = "Release"
66-
revealArchiveInOrganizer = "YES">
67-
</ArchiveAction>
6832
</Scheme>

‎VimR/VimR.xcodeproj/xcshareddata/xcschemes/VimRTests.xcscheme

+4-36
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
43
version = "1.3">
5-
<BuildAction
6-
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
4+
<BuildAction>
85
<BuildActionEntries>
96
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
7+
buildForTesting = "YES">
158
<BuildableReference
169
BuildableIdentifier = "primary"
1710
BlueprintIdentifier = "4BEBA5131CFF374B00673FDF"
@@ -23,13 +16,9 @@
2316
</BuildActionEntries>
2417
</BuildAction>
2518
<TestAction
26-
buildConfiguration = "Debug"
27-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "NO">
19+
buildConfiguration = "Debug">
3020
<Testables>
31-
<TestableReference
32-
skipped = "NO">
21+
<TestableReference>
3322
<BuildableReference
3423
BuildableIdentifier = "primary"
3524
BlueprintIdentifier = "4BEBA5131CFF374B00673FDF"
@@ -41,28 +30,7 @@
4130
</Testables>
4231
</TestAction>
4332
<LaunchAction
44-
buildConfiguration = "Debug"
45-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47-
launchStyle = "0"
4833
useCustomWorkingDirectory = "NO"
49-
ignoresPersistentStateOnLaunch = "NO"
50-
debugDocumentVersioning = "YES"
51-
debugServiceExtension = "internal"
5234
allowLocationSimulation = "YES">
5335
</LaunchAction>
54-
<ProfileAction
55-
buildConfiguration = "Release"
56-
shouldUseLaunchSchemeArgsEnv = "YES"
57-
savedToolIdentifier = ""
58-
useCustomWorkingDirectory = "NO"
59-
debugDocumentVersioning = "YES">
60-
</ProfileAction>
61-
<AnalyzeAction
62-
buildConfiguration = "Debug">
63-
</AnalyzeAction>
64-
<ArchiveAction
65-
buildConfiguration = "Release"
66-
revealArchiveInOrganizer = "YES">
67-
</ArchiveAction>
6836
</Scheme>

‎bin/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/third_party/build
2+
/third_party/vimr-deps

‎bin/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
* Install the requirements
1313
```bash
1414
pip install -r requirements.txt
15+
python setup.py develop
1516
```

‎third-party/__init__.py renamed to ‎bin/__init__.py

File renamed without changes.

‎bin/build_deps.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ main () {
1515
local -r xz_version="5.3.2alpha"
1616
local -r ag_version="2.2.0"
1717

18-
pushd ./third-party >/dev/null
19-
python3 build.py \
18+
pushd ./bin >/dev/null
19+
python third_party/build.py \
2020
--arm64-deployment-target="${arm64_deployment_target}" \
2121
--x86_64-deployment-target="${x86_64_deployment_target}" \
2222
--xz-version "${xz_version}" \

‎bin/setup.py

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import setuptools
2+
3+
setuptools.setup(
4+
name="com.qvacua.VimR.bin",
5+
version="0.0.0",
6+
author="Tae Won Ha",
7+
description="Scripts for building VimR",
8+
packages=setuptools.find_packages(),
9+
python_requires=">=3.9",
10+
)

‎third-party/README.md renamed to ‎bin/third_party/README.md

File renamed without changes.

‎third-party/deps/__init__.py renamed to ‎bin/third_party/__init__.py

File renamed without changes.

‎third-party/build.py renamed to ‎bin/third_party/build.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import pathlib
33
import shutil
44

5-
from builder import Builder
6-
from config import Config
7-
from deps import ag, pcre, xz
8-
from deps.ag import AgBuilder
5+
from third_party.config import Config
6+
from third_party.deps import ag, pcre, xz
7+
from third_party.deps.ag import AgBuilder
8+
from third_party.builder import Builder
99

1010
DEPS_FILE_NAME = ".deps"
1111
PACKAGE_NAME = "vimr-deps"

‎third-party/builder.py renamed to ‎bin/third_party/builder.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from dataclasses import dataclass
22
from string import Template
33

4-
from config import Config, Target
5-
from utils.shell import shell
4+
from third_party.config import Config, Target
5+
from third_party.utils.shell import shell
66

77

88
@dataclass(frozen=True)

‎third-party/config.py renamed to ‎bin/third_party/config.py

File renamed without changes.

‎third-party/utils/__init__.py renamed to ‎bin/third_party/deps/__init__.py

File renamed without changes.

‎third-party/deps/ag.py renamed to ‎bin/third_party/deps/ag.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from dataclasses import dataclass
22
from string import Template
33

4-
from builder import Builder
5-
from config import Config, Target
6-
from utils.shell import shell
4+
from third_party.builder import Builder
5+
from third_party.config import Config, Target
6+
from third_party.utils.shell import shell
77

88
# language=bash
99
download_command = Template(

‎third-party/deps/pcre.py renamed to ‎bin/third_party/deps/pcre.py

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
from string import Template
2-
from config import Target
3-
from builder import Builder
4-
from utils.shell import shell
52

63

74
# "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2" seems to be down as of 2021-11-04.

‎third-party/deps/xz.py renamed to ‎bin/third_party/deps/xz.py

File renamed without changes.

‎bin/third_party/utils/__init__.py

Whitespace-only changes.

‎third-party/utils/shell.py renamed to ‎bin/third_party/utils/shell.py

File renamed without changes.

‎bin/workflows

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.github/workflows

‎third-party/.gitignore

-1
This file was deleted.

‎third-party/.python-version

-1
This file was deleted.

‎third-party/requirements.txt

-1
This file was deleted.

‎third-party/setup.py

-10
This file was deleted.

‎third-party/vimr-deps/include/config.h

-122
This file was deleted.

0 commit comments

Comments
 (0)