Merge pull request #312 from redtide/application-name

Use lite-xl as project and executable names
This commit is contained in:
Adam 2021-06-27 17:12:23 -04:00 committed by GitHub
commit 4d4c49e36e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 14 deletions

2
.gitignore vendored
View File

@ -7,5 +7,5 @@ build*
subprojects/lua subprojects/lua
subprojects/libagg subprojects/libagg
subprojects/reproc subprojects/reproc
lite lite-xl
error.txt error.txt

View File

@ -44,7 +44,7 @@ lite_build_pgo () {
meson setup --buildtype=release -Db_pgo=generate "$build" || exit 1 meson setup --buildtype=release -Db_pgo=generate "$build" || exit 1
ninja -C "$build" || exit 1 ninja -C "$build" || exit 1
copy_directory_from_repo data "$build/src" copy_directory_from_repo data "$build/src"
"$build/src/lite" "$build/src/lite-xl"
meson configure -Db_pgo=use "$build" meson configure -Db_pgo=use "$build"
ninja -C "$build" || exit 1 ninja -C "$build" || exit 1
} }
@ -74,8 +74,8 @@ lite_build_package_windows () {
for module_name in plugins colors; do for module_name in plugins colors; do
cp -r "$build/third/data/$module_name" "$datadir" cp -r "$build/third/data/$module_name" "$datadir"
done done
cp "$build/src/lite.exe" "$bindir" cp "$build/src/lite-xl.exe" "$bindir"
strip --strip-all "$bindir/lite.exe" strip --strip-all "$bindir/lite-xl.exe"
pushd ".package-build" pushd ".package-build"
local package_name="lite-xl-$os-$arch$portable.zip" local package_name="lite-xl-$os-$arch$portable.zip"
zip "$package_name" -r "lite-xl" zip "$package_name" -r "lite-xl"
@ -102,7 +102,7 @@ lite_build_package_macos () {
done done
cp resources/icons/icon.icns "$appdir/Contents/Resources/icon.icns" cp resources/icons/icon.icns "$appdir/Contents/Resources/icon.icns"
cp resources/macos/Info.plist "$appdir/Contents/Info.plist" cp resources/macos/Info.plist "$appdir/Contents/Info.plist"
cp "$build/src/lite" "$bindir/lite-xl" cp "$build/src/lite-xl" "$bindir/lite-xl"
strip "$bindir/lite-xl" strip "$bindir/lite-xl"
pushd ".package-build" pushd ".package-build"
local package_name="lite-xl-$os-$arch.zip" local package_name="lite-xl-$os-$arch.zip"
@ -138,12 +138,12 @@ lite_build_package_linux () {
for module_name in plugins colors; do for module_name in plugins colors; do
cp -r "$build/third/data/$module_name" "$datadir" cp -r "$build/third/data/$module_name" "$datadir"
done done
cp "$build/src/lite" "$bindir" cp "$build/src/lite-xl" "$bindir"
strip "$bindir/lite" strip "$bindir/lite-xl"
if [ -z "$portable" ]; then if [ -z "$portable" ]; then
mkdir -p "$pdir/share/applications" "$pdir/share/icons/hicolor/scalable/apps" mkdir -p "$pdir/share/applications" "$pdir/share/icons/hicolor/scalable/apps"
cp "resources/linux/lite-xl.desktop" "$pdir/share/applications" cp "resources/linux/lite-xl.desktop" "$pdir/share/applications"
cp "resources/icons/lite.svg" "$pdir/share/icons/hicolor/scalable/apps/lite-xl.svg" cp "resources/icons/lite-xl.svg" "$pdir/share/icons/hicolor/scalable/apps/lite-xl.svg"
fi fi
pushd ".package-build" pushd ".package-build"
local package_name="lite-xl-$os-$arch$portable.tar.gz" local package_name="lite-xl-$os-$arch$portable.tar.gz"

View File

@ -12,7 +12,7 @@ if [[ $* == *windows* ]]; then
echo "cross compiling for windows is not yet supported" echo "cross compiling for windows is not yet supported"
exit 1 exit 1
else else
outfile="lite" outfile="lite-xl"
compiler="gcc" compiler="gcc"
cxxcompiler="g++" cxxcompiler="g++"
fi fi
@ -20,7 +20,7 @@ fi
lib/font_renderer/build.sh || exit 1 lib/font_renderer/build.sh || exit 1
libs=libfontrenderer.a libs=libfontrenderer.a
echo "compiling lite..." echo "compiling lite-xl..."
for f in `find src -name "*.c"`; do for f in `find src -name "*.c"`; do
$compiler -c $cflags $f -o "${f//\//_}.o" $compiler -c $cflags $f -o "${f//\//_}.o"
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then

View File

@ -1,4 +1,4 @@
project('lite', 'c', 'cpp', default_options : ['c_std=gnu11', 'cpp_std=c++03']) project('lite-xl', 'c', 'cpp', default_options : ['c_std=gnu11', 'cpp_std=c++03'])
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
add_languages('objc') add_languages('objc')

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -2,10 +2,9 @@
Type=Application Type=Application
Name=Lite XL Name=Lite XL
Comment=A lightweight text editor written in Lua Comment=A lightweight text editor written in Lua
Exec=lite %F Exec=lite-xl %F
Icon=lite-xl Icon=lite-xl
Terminal=false Terminal=false
StartupNotify=false StartupNotify=false
Categories=Utility;TextEditor;Development; Categories=Utility;TextEditor;Development;
MimeType=text/plain; MimeType=text/plain;

View File

@ -17,7 +17,7 @@ if host_machine.system() == 'darwin'
lite_sources += 'bundle_open.m' lite_sources += 'bundle_open.m'
endif endif
executable('lite', executable('lite-xl',
lite_sources + lite_rc, lite_sources + lite_rc,
include_directories: [lite_include, font_renderer_include], include_directories: [lite_include, font_renderer_include],
dependencies: lite_deps, dependencies: lite_deps,