Skip to content

Commit f2b33ef

Browse files
committed
removed licensing
1 parent ea07520 commit f2b33ef

File tree

12 files changed

+225
-333
lines changed

12 files changed

+225
-333
lines changed

.github/workflows/build_multi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8484
with:
8585
upload_url: ${{ needs.create_release.outputs.upload_url }}
86-
asset_path: tmp/orb-${{ env.VERSION }}-ubuntu-20.04-x86_64.tar.gz
86+
asset_path: orb-${{ env.VERSION }}-ubuntu-20.04-x86_64.tar.gz
8787
asset_name: orb-${{ env.VERSION }}-ubuntu-20.04-x86_64.tar.gz
8888
asset_content_type: application/zip
8989
build_windows:

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.21.15
1+
0.21.15

build_system/armor.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def build_common(c, env, sep=":"):
134134
)
135135
data = " ".join(f"--add-data {s}{sep}{d}" for s, d in data)
136136
hidden_imports = "--hidden-import orb.orb_main --hidden-import orb.core --hidden-import orb.core_ui.hidden_imports --hidden-import kivy --hidden-import plyer.platforms.macosx.uniqueid --hidden-import orb.core_ui.kvs --hidden-import orb.misc --hidden-import jaraco.text --hidden-import kivymd.effects.stiffscroll.StiffScrollEffect --hidden-import fabric --hidden-import=pkg_resources" # --hidden-import pandas.plotting._matplotlib
137-
pyinstall_flags = f" {paths} {data} {hidden_imports} --onedir --{'windowed' if sep == ':' else 'console'} --name lnorb"
137+
pyinstall_flags = f" -y {paths} {data} {hidden_imports} --onedir --{'windowed' if sep == ':' else 'console'} --name lnorb"
138138

139139
print("=" * 50)
140140
print(pyinstall_flags)
@@ -146,14 +146,14 @@ def build_common(c, env, sep=":"):
146146
@task
147147
def build_linux(c, do_upload=True, env=os.environ):
148148
c.run("rm -rf dist tmp;")
149-
c.run("mkdir -p tmp;")
150-
c.run("cp -r main.py tmp/;")
151-
c.run("cp -r third_party tmp/;")
152-
c.run("cp -r orb tmp/;")
149+
c.run("mkdir -p tmp/orb/;")
150+
c.run("cp -r main.py tmp/orb/;")
151+
c.run("cp -r third_party tmp/orb/;")
152+
c.run("cp -r orb tmp/orb/;")
153153
with c.cd("tmp"):
154154
for source, target in data:
155155
c.run(f"mkdir -p {target}")
156-
c.run(f"cp -r ../{source} {target}")
156+
c.run(f"cp -r ../{source} orb/{target}")
157157
# with c.cd("orb"):
158158
# c.run("python main.py test run-all-tests")
159159
with open("tmp/orb/bootstrap_ubuntu_20_04.sh", "w") as f:
@@ -162,7 +162,7 @@ def build_linux(c, do_upload=True, env=os.environ):
162162
f"orb-{VERSION}-{os.environ.get('os-name', 'undefined')}-x86_64.tar.gz"
163163
)
164164
print(f"BUILD NAME: {build_name}")
165-
c.run(f"tar czvf {build_name} orb;")
165+
c.run(f"tar czvf ../{build_name} .;")
166166

167167

168168
@task
@@ -198,7 +198,7 @@ def dmg(c, env=os.environ):
198198
--icon "lnorb" 200 190 \
199199
--app-drop-link 600 185 \
200200
"{name}.dmg" \
201-
"dist/{name}"
201+
"dist/lnorb.app"
202202
""",
203203
env=env,
204204
)

install.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ function main() {
6262
fi
6363
sudo hdiutil attach ${DMG}; # mount the DMG file
6464
sudo rm -rf /Applications/lnorb; # remove any existing Orb installation
65-
sudo cp -r /Volumes/Orb/lnorb /Applications/; # copy the new Orb installation to the /Applications directory
66-
sudo echo '/Applications/lnorb/Contents/MacOS/lnorb' > /usr/local/bin/orb; # create a symlink to the Orb executable in /usr/local/bin/
65+
sudo rm -rf /Applications/lnorb.app; # remove any existing Orb installation
66+
sudo cp -r /Volumes/Orb/lnorb.app /Applications/; # copy the new Orb installation to the /Applications directory
67+
echo '/Applications/lnorb.app/Contents/MacOS/lnorb' > /tmp/orb_link; # create a symlink to the Orb executable in /usr/local/bin/
68+
sudo cp /tmp/orb_link /usr/local/bin/
6769
sudo chmod 755 /usr/local/bin/orb; # make the symlink executable
6870
hash -r; # reset the shell's command cache
6971
print_success_message; # print a success message

0 commit comments

Comments
 (0)