Skip to content
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

Jump to bottom

feat(src/cli/cli.cc): print installation path #451

Merged
merged 3 commits into from
May 18, 2023
Merged

feat(src/cli/cli.cc): print installation path #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dd72c5
feat(src/cli/cli.cc): print installation path
chicoxyzzy May 18, 2023
fa04abb
fix(CI): update check version scripts
chicoxyzzy May 18, 2023
aaff30f
fix(cli/cli.cc): print installation path to stderr
chicoxyzzy May 18, 2023
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
2 changes: 1 addition & 1 deletion bin/ci_version_check.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if ($env:Path -notlike "*$BIN_PATH*") {
$env:Path = $new_path
}

$VERSION_SSC = $(ssc -v) 2>&1 | % ToString
$VERSION_SSC = $(ssc -v 2>&1 | Select-Object -First 1) | % ToString
$VERSION_TXT = $(type VERSION.txt) 2>&1 | % ToString
$VERSION_GIT = $(git rev-parse --short=8 HEAD) 2>&1 | % ToString
$VERSION_EXPECTED = "$VERSION_TXT ($VERSION_GIT)"
Expand Down
2 changes: 1 addition & 1 deletion bin/ci_version_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

VERSION_SSC=$(ssc -v)
VERSION_SSC=$(ssc -v | head -n 1)

VERSION_TXT=$(cat VERSION.txt)
VERSION_GIT=$(git rev-parse --short=8 HEAD)
Expand Down
6 changes: 3 additions & 3 deletions bin/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ function _build_runtime_library() {
"$root/bin/build-runtime-library.sh" --arch "$arch" --platform ios $pass_force $pass_ignore_header_mtimes & pids+=($!)
"$root/bin/build-runtime-library.sh" --arch x86_64 --platform ios-simulator $pass_force $pass_ignore_header_mtimes & pids+=($!)
if [[ "$arch" = "arm64" ]] && [[ -z "$NO_IOS" ]]; then
"$root/bin/build-runtime-library.sh" --arch "$arch" --platform ios-simulator $pass_force $pass_ignore_header_mtimes & pids+=($!)
"$root/bin/build-runtime-library.sh" --arch "$arch" --platform ios-simulator $pass_force $pass_ignore_header_mtimes & pids+=($!)
fi
fi

Expand Down Expand Up @@ -672,7 +672,7 @@ function _compile_libuv_android {
local cflags=("$clang_target" -std=gnu89 -g -pedantic -I"$root"/build/uv/include -I"$root"/build/uv/src -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_LARGEFILE_SOURCE -fPIC -Wall -Wextra -Wno-pedantic -Wno-sign-compare -Wno-unused-parameter -Wno-implicit-function-declaration)
cflags+=("${android_includes[*]}")
local objects=()
local sources=("unix/async.c" "unix/core.c" "unix/dl.c" "unix/fs.c" "unix/getaddrinfo.c" "unix/getnameinfo.c" "unix/linux.c" "unix/loop.c" "unix/loop-watcher.c" "unix/pipe.c" "unix/poll.c" "unix/process.c" "unix/proctitle.c" "unix/random-devurandom.c" "unix/random-getentropy.c" "unix/random-getrandom.c" "unix/random-sysctl-linux.c" "unix/signal.c" "unix/stream.c" "unix/tcp.c" "unix/thread.c" "unix/tty.c" "unix/udp.c" fs-poll.c idna.c inet.c random.c strscpy.c strtok.c threadpool.c timer.c uv-common.c uv-data-getter-setters.c version.c)
local sources=("unix/async.c" "unix/core.c" "unix/dl.c" "unix/fs.c" "unix/getaddrinfo.c" "unix/getnameinfo.c" "unix/linux.c" "unix/loop.c" "unix/loop-watcher.c" "unix/pipe.c" "unix/poll.c" "unix/process.c" "unix/proctitle.c" "unix/random-devurandom.c" "unix/random-getentropy.c" "unix/random-getrandom.c" "unix/random-sysctl-linux.c" "unix/signal.c" "unix/stream.c" "unix/tcp.c" "unix/thread.c" "unix/tty.c" "unix/udp.c" fs-poll.c idna.c inet.c random.c strscpy.c strtok.c threadpool.c timer.c uv-common.c uv-data-getter-setters.c version.c)

declare output_directory="$root/build/$arch-$platform/uv$d"
mkdir -p "$output_directory"
Expand Down Expand Up @@ -912,7 +912,7 @@ if [[ "$(uname -s)" == "Darwin" ]] && [[ -z "$NO_IOS" ]]; then
_setSDKVersion iPhoneOS

_compile_libuv arm64 iPhoneOS & pids+=($!)
_compile_libuv x86_64 iPhoneSimulator & pids+=($!)
_compile_libuv x86_64 iPhoneSimulator & pids+=($!)
if [[ "$arch" = "arm64" ]]; then
_compile_libuv arm64 iPhoneSimulator & pids+=($!)
fi
Expand Down
1 change: 1 addition & 0 deletions src/cli/cli.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,7 @@ int main (const int argc, const char* argv[]) {

if (is(subcommand, "-v") || is(subcommand, "--version")) {
std::cout << SSC::VERSION_FULL_STRING << std::endl;
std::cerr << "Installation path: " << getSocketHome() << std::endl;
exit(0);
}

Expand Down
2 changes: 1 addition & 1 deletion src/cli/templates.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ constexpr auto gHelloWorld = R"HTML(
<!doctype html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
<style type="text/css">
html, body {
height: 100%;
Expand Down
Loading