Skip to content

[IMP] vscode: build vsix in dedicated build folder #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[IMP] vscode: build vsix in dedicated build folder #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ vscode/requirements.txt
vscode/server
vscode/CHANGELOG.md
vscode/package-lock.json
vscode/build
1 change: 1 addition & 0 deletions vscode/.vscodeignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ node_modules/
**/requirements.in
**/venv/
**/__pycache__/
build/

!node_modules/@vscode-elements/elements/**
!node_modules/@vscode/codicons/**
Expand Down
4 changes: 2 additions & 2 deletions vscode/build_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ if {
[[ $(( ${version_list[1]} % 2 )) -eq 1 && $(( ${version_list[0]} )) -ne 0 ]]
}; then
echo "pre-release version $PACKAGE_VERSION"
nox --session build_package_prerelease -- "$@"
nox --session build_package_prerelease -- $PACKAGE_VERSION "$@"
else
echo "release version $PACKAGE_VERSION"
nox --session build_package -- "$@"
nox --session build_package -- $PACKAGE_VERSION "$@"
fi

read -n 1 -s -r -p "Press any key to close..."
16 changes: 10 additions & 6 deletions vscode/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ def build_specific_target(session: nox.Session, target: str, debug: bool) -> Non
else:
print(f"Unknown target: {target}")
return
if not Path(f"../server/target/{rust_target}/{status}/{file_name}").is_file():
if not Path(f"../server/target/{rust_target}/release/{file_name}").is_file():
print(f"Unable to find odoo_ls_server binary for {target}, please build the server first.")
return
session.run("cp", f"../server/target/{rust_target}/{status}/{file_name}", file_name, external=True)
session.run("cp", f"../server/target/{rust_target}/release/{file_name}", file_name, external=True)
if take_pdb:
if Path(f"../server/target/{rust_target}/{status}/odoo_ls_server.pdb").is_file():
session.run("cp", f"../server/target/{rust_target}/{status}/odoo_ls_server.pdb", "odoo_ls_server.pdb", external=True)
if Path(f"../server/target/{rust_target}/release/odoo_ls_server.pdb").is_file():
session.run("cp", f"../server/target/{rust_target}/release/odoo_ls_server.pdb", "odoo_ls_server.pdb", external=True)
else:
print(f"Unable to find odoo_ls_server.pdb for {target}, please build the server first.")
return
Expand All @@ -112,7 +112,7 @@ def build_specific_target(session: nox.Session, target: str, debug: bool) -> Non
def get_targets(session: nox.Session) -> List[str]:
"""Returns the list of targets to build."""
res = []
for arg in session.posargs:
for arg in session.posargs[1:]:
if arg == "all":
if len(res) > 0:
print("You can't use all if specific targets are already specified.")
Expand Down Expand Up @@ -155,21 +155,25 @@ def build_package(session: nox.Session) -> None:
session.run("cp", "../changelog.md", "changelog.md", external=True)
for target in targets:
build_specific_target(session, target, False)
session.run("mv", f"odoo-{target}-{session.posargs[0]}.vsix", f"build/{session.posargs[0]}/odoo-{target}-{session.posargs[0]}.vsix", external=True)
session.run("rm", "-r", "typeshed", external=True)
session.run("rm", "-r", "additional_stubs", external=True)
session.run("rm", "changelog.md", external=True)

@nox.session()
def build_package_prerelease(session: nox.Session) -> None:
"""Builds VSIX package for publishing."""
os.makedirs("build", exist_ok=True)
os.makedirs(f"build/{session.posargs[0]}", exist_ok=True)
targets = get_targets(session)
_setup_template_environment(session)
session.run("npm", "install", external=True)
copy_dir(session, "../server/typeshed", "typeshed")
copy_dir(session, "../server/additional_stubs", "additional_stubs")
session.run("cp", "../changelog.md", "changelog.md", external=True)
for target in targets:
build_specific_target(session, target, False)
build_specific_target(session, target, True)
session.run("mv", f"odoo-{target}-{session.posargs[0]}.vsix", f"build/{session.posargs[0]}/odoo-{target}-{session.posargs[0]}.vsix", external=True)
session.run("rm", "-r", "typeshed", external=True)
session.run("rm", "-r", "additional_stubs", external=True)
session.run("rm", "changelog.md", external=True)
Expand Down