diff --git a/.gitignore b/.gitignore index 6a26aa12..92d20437 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,5 @@ build* subprojects/lua subprojects/libagg subprojects/reproc -lite +lite-xl error.txt diff --git a/build-packages.sh b/build-packages.sh index 593aaba8..3701ac53 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -44,7 +44,7 @@ lite_build_pgo () { meson setup --buildtype=release -Db_pgo=generate "$build" || exit 1 ninja -C "$build" || exit 1 copy_directory_from_repo data "$build/src" - "$build/src/lite" + "$build/src/lite-xl" meson configure -Db_pgo=use "$build" ninja -C "$build" || exit 1 } @@ -74,8 +74,8 @@ lite_build_package_windows () { for module_name in plugins colors; do cp -r "$build/third/data/$module_name" "$datadir" done - cp "$build/src/lite.exe" "$bindir" - strip --strip-all "$bindir/lite.exe" + cp "$build/src/lite-xl.exe" "$bindir" + strip --strip-all "$bindir/lite-xl.exe" pushd ".package-build" local package_name="lite-xl-$os-$arch$portable.zip" zip "$package_name" -r "lite-xl" @@ -102,7 +102,7 @@ lite_build_package_macos () { done cp resources/icons/icon.icns "$appdir/Contents/Resources/icon.icns" 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" pushd ".package-build" local package_name="lite-xl-$os-$arch.zip" @@ -138,12 +138,12 @@ lite_build_package_linux () { for module_name in plugins colors; do cp -r "$build/third/data/$module_name" "$datadir" done - cp "$build/src/lite" "$bindir" - strip "$bindir/lite" + cp "$build/src/lite-xl" "$bindir" + strip "$bindir/lite-xl" if [ -z "$portable" ]; then mkdir -p "$pdir/share/applications" "$pdir/share/icons/hicolor/scalable/apps" 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 pushd ".package-build" local package_name="lite-xl-$os-$arch$portable.tar.gz" diff --git a/build.sh b/build.sh index eb1d420a..b49dc1bf 100755 --- a/build.sh +++ b/build.sh @@ -12,7 +12,7 @@ if [[ $* == *windows* ]]; then echo "cross compiling for windows is not yet supported" exit 1 else - outfile="lite" + outfile="lite-xl" compiler="gcc" cxxcompiler="g++" fi @@ -20,7 +20,7 @@ fi lib/font_renderer/build.sh || exit 1 libs=libfontrenderer.a -echo "compiling lite..." +echo "compiling lite-xl..." for f in `find src -name "*.c"`; do $compiler -c $cflags $f -o "${f//\//_}.o" if [[ $? -ne 0 ]]; then diff --git a/meson.build b/meson.build index 38eda308..1f1ff0d2 100644 --- a/meson.build +++ b/meson.build @@ -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' add_languages('objc') diff --git a/resources/icons/lite.svg b/resources/icons/lite-xl.svg similarity index 100% rename from resources/icons/lite.svg rename to resources/icons/lite-xl.svg diff --git a/resources/linux/lite-xl.desktop b/resources/linux/lite-xl.desktop index dbcb779a..f2fa9610 100644 --- a/resources/linux/lite-xl.desktop +++ b/resources/linux/lite-xl.desktop @@ -2,10 +2,9 @@ Type=Application Name=Lite XL Comment=A lightweight text editor written in Lua -Exec=lite %F +Exec=lite-xl %F Icon=lite-xl Terminal=false StartupNotify=false Categories=Utility;TextEditor;Development; MimeType=text/plain; - diff --git a/src/meson.build b/src/meson.build index 9516c94d..03cc826f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -17,7 +17,7 @@ if host_machine.system() == 'darwin' lite_sources += 'bundle_open.m' endif -executable('lite', +executable('lite-xl', lite_sources + lite_rc, include_directories: [lite_include, font_renderer_include], dependencies: lite_deps,