Skip to content

Commit

Permalink
Merge pull request pharo-project#617 from Bajger/616-Print-image-proc…
Browse files Browse the repository at this point in the history
…ess-list-in-nice-formatted-way

616 print image process list in nice formatted way
  • Loading branch information
demarey authored Feb 5, 2024
2 parents 3ff6afa + a59699f commit a5334e6
Show file tree
Hide file tree
Showing 111 changed files with 1,318 additions and 405 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ jobs:
- uses: actions/upload-artifact@v3
with:
name: PharoLauncher-linux-${{ env.LAUNCHER_VERSION }}-${{ env.FILE_NAME_ARCH_SUFFIX }}
path: |
build/
path: pharo-launcher-linux.tar

outputs:
launcherVersion: ${{ env.LAUNCHER_VERSION }}
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: documentation
on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
inputs:
deploy-to-gh-pages:
type: boolean
description: Deploy the documentation built with mkdocs to GitHub pages?

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.x
- run: pip install mkdocs

- run: mkdocs build
if: github.event.inputs.deploy-to-gh-pages == 'false'
- uses: actions/upload-artifact@v3
with:
name: pharo-launcher-documentation
path: site
if: github.event.inputs.deploy-to-gh-pages == 'false'

- run: mkdocs gh-deploy
if: github.event.inputs.deploy-to-gh-pages == 'true'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ site/
*.html

*.swp

.DS_Store
17 changes: 0 additions & 17 deletions PharoLauncherCmdLine-description.md

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The Pharo Launcher is a cross-platform application that
- lets you create new images from any template,
- automatically find and download the appropriate VM to launch your images.

<img src="./docs/images/pharo-launcher-main-window.png" height="450" alt="A Pharo Launcher screenshot">
<img src="./doc/images/pharo-launcher-main-window.png" height="450" alt="A Pharo Launcher screenshot">

The idea behind the Pharo Launcher is that you should be able to access it very rapidly from your OS application launcher. As a result,
launching any image is never more than 3 clicks away.
Expand Down Expand Up @@ -84,4 +84,4 @@ Metacello new
load
```

Then evaluate "PharoLauncher open". You can also launch it from the World menu.
Then evaluate "PharoLauncherApplication open". You can also launch it from the World menu.
6 changes: 4 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function package_linux_version() {
OUTPUT_PATH=build
RESOURCES_PATH=$OUTPUT_PATH/shared
rm -f $OUTPUT_PATH; mkdir $OUTPUT_PATH
mkdir $OUTPUT_PATH/icons; cp icons/pharo-launcher.png $OUTPUT_PATH/
mkdir $OUTPUT_PATH/icons; cp icons/pharo-launcher.png $OUTPUT_PATH/icons/
cp linux/pharo-launcher-ui $OUTPUT_PATH/
cp scripts/pharo-launcher.sh $OUTPUT_PATH/pharo-launcher
mkdir $RESOURCES_PATH
Expand All @@ -74,9 +74,11 @@ function package_linux_version() {
cp PharoLauncher.image $RESOURCES_PATH
cp PharoLauncher.changes $RESOURCES_PATH
cp Pharo*.sources $RESOURCES_PATH
fetch_current_vm_to $(pwd)/$RESOURCES_PATH
fetch_current_vm_to $OUTPUT_PATH
# ensure the linux scripts are executable
chmod +x "$OUTPUT_PATH/pharo-launcher" "$OUTPUT_PATH/pharo-launcher-ui" || true
mv build pharo-launcher
tar -cvf pharo-launcher-linux.tar pharo-launcher
}

function copy_mac_icon_files_to() {
Expand Down
Loading

0 comments on commit a5334e6

Please sign in to comment.