Skip to content

Commit 5a581e4

Browse files
committed
[IMP] vscode: build vsix in dedicated build folder
1 parent 5d3735d commit 5a581e4

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ vscode/requirements.txt
2020
vscode/server
2121
vscode/CHANGELOG.md
2222
vscode/package-lock.json
23+
vscode/build

vscode/.vscodeignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ node_modules/
2727
**/requirements.in
2828
**/venv/
2929
**/__pycache__/
30+
build/
3031

3132
!node_modules/@vscode-elements/elements/**
3233
!node_modules/@vscode/codicons/**

vscode/build_package.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ if {
3030
[[ $(( ${version_list[1]} % 2 )) -eq 1 && $(( ${version_list[0]} )) -ne 0 ]]
3131
}; then
3232
echo "pre-release version $PACKAGE_VERSION"
33-
nox --session build_package_prerelease -- "$@"
33+
nox --session build_package_prerelease -- $PACKAGE_VERSION "$@"
3434
else
3535
echo "release version $PACKAGE_VERSION"
36-
nox --session build_package -- "$@"
36+
nox --session build_package -- $PACKAGE_VERSION "$@"
3737
fi
3838

3939
read -n 1 -s -r -p "Press any key to close..."

vscode/noxfile.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ def build_specific_target(session: nox.Session, target: str, debug: bool) -> Non
9090
else:
9191
print(f"Unknown target: {target}")
9292
return
93-
if not Path(f"../server/target/{rust_target}/{status}/{file_name}").is_file():
93+
if not Path(f"../server/target/{rust_target}/release/{file_name}").is_file():
9494
print(f"Unable to find odoo_ls_server binary for {target}, please build the server first.")
9595
return
96-
session.run("cp", f"../server/target/{rust_target}/{status}/{file_name}", file_name, external=True)
96+
session.run("cp", f"../server/target/{rust_target}/release/{file_name}", file_name, external=True)
9797
if take_pdb:
98-
if Path(f"../server/target/{rust_target}/{status}/odoo_ls_server.pdb").is_file():
99-
session.run("cp", f"../server/target/{rust_target}/{status}/odoo_ls_server.pdb", "odoo_ls_server.pdb", external=True)
98+
if Path(f"../server/target/{rust_target}/release/odoo_ls_server.pdb").is_file():
99+
session.run("cp", f"../server/target/{rust_target}/release/odoo_ls_server.pdb", "odoo_ls_server.pdb", external=True)
100100
else:
101101
print(f"Unable to find odoo_ls_server.pdb for {target}, please build the server first.")
102102
return
@@ -112,7 +112,7 @@ def build_specific_target(session: nox.Session, target: str, debug: bool) -> Non
112112
def get_targets(session: nox.Session) -> List[str]:
113113
"""Returns the list of targets to build."""
114114
res = []
115-
for arg in session.posargs:
115+
for arg in session.posargs[1:]:
116116
if arg == "all":
117117
if len(res) > 0:
118118
print("You can't use all if specific targets are already specified.")
@@ -147,6 +147,8 @@ def get_targets(session: nox.Session) -> List[str]:
147147
@nox.session()
148148
def build_package(session: nox.Session) -> None:
149149
"""Builds VSIX package for publishing."""
150+
os.makedirs("build", exist_ok=True)
151+
os.makedirs(f"build/{session.posargs[0]}", exist_ok=True)
150152
targets = get_targets(session)
151153
_setup_template_environment(session)
152154
session.run("npm", "install", external=True)
@@ -155,21 +157,25 @@ def build_package(session: nox.Session) -> None:
155157
session.run("cp", "../changelog.md", "changelog.md", external=True)
156158
for target in targets:
157159
build_specific_target(session, target, False)
160+
session.run("mv", f"odoo-{target}-{session.posargs[0]}.vsix", f"build/{session.posargs[0]}/odoo-{target}-{session.posargs[0]}.vsix", external=True)
158161
session.run("rm", "-r", "typeshed", external=True)
159162
session.run("rm", "-r", "additional_stubs", external=True)
160163
session.run("rm", "changelog.md", external=True)
161164

162165
@nox.session()
163166
def build_package_prerelease(session: nox.Session) -> None:
164167
"""Builds VSIX package for publishing."""
168+
os.makedirs("build", exist_ok=True)
169+
os.makedirs(f"build/{session.posargs[0]}", exist_ok=True)
165170
targets = get_targets(session)
166171
_setup_template_environment(session)
167172
session.run("npm", "install", external=True)
168173
copy_dir(session, "../server/typeshed", "typeshed")
169174
copy_dir(session, "../server/additional_stubs", "additional_stubs")
170175
session.run("cp", "../changelog.md", "changelog.md", external=True)
171176
for target in targets:
172-
build_specific_target(session, target, False)
177+
build_specific_target(session, target, True)
178+
session.run("mv", f"odoo-{target}-{session.posargs[0]}.vsix", f"build/{session.posargs[0]}/odoo-{target}-{session.posargs[0]}.vsix", external=True)
173179
session.run("rm", "-r", "typeshed", external=True)
174180
session.run("rm", "-r", "additional_stubs", external=True)
175181
session.run("rm", "changelog.md", external=True)

0 commit comments

Comments
 (0)