Skip to content

Commit

Permalink
🔧 Rebrand this fork to Diesel
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherFoxGuy committed Dec 4, 2023
1 parent 2d68334 commit 6037b7c
Show file tree
Hide file tree
Showing 39 changed files with 218 additions and 350 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ jobs:
- name: Upload redist folder
uses: actions/upload-artifact@v3
with:
name: fuel-${{ runner.os }}
name: diesel-${{ runner.os }}
path: redist
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${RUNTIME_OUTPUT_DIRECTORY})
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${RUNTIME_OUTPUT_DIRECTORY})
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${RUNTIME_OUTPUT_DIRECTORY})

project(Fuel VERSION "2.0.0")
project(Diesel VERSION "2.0.0")

set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
Expand Down Expand Up @@ -116,10 +116,10 @@ endif ()
if (WIN32)
# clang-cl doesn't support resource files
if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
list(APPEND SOURCES "${CMAKE_SOURCE_DIR}/rsrc/fuel.rc")
list(APPEND SOURCES "${CMAKE_SOURCE_DIR}/rsrc/diesel.rc")
endif ()
elseif (APPLE)
list(APPEND SOURCES "${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.icns")
list(APPEND SOURCES "${CMAKE_SOURCE_DIR}/rsrc/icons/diesel.icns")
endif ()

add_executable(
Expand All @@ -144,7 +144,7 @@ else ()
target_link_libraries(${PROJECT_NAME} PRIVATE Qt6keychain)
endif ()

target_compile_definitions(${PROJECT_NAME} PRIVATE FUEL_VERSION="${PROJECT_VERSION}")
target_compile_definitions(${PROJECT_NAME} PRIVATE DIESEL_VERSION="${PROJECT_VERSION}")

if (0)
add_dependencies(${PROJECT_NAME} translations)
Expand Down Expand Up @@ -214,7 +214,7 @@ if (WIN32)

set(CPACK_INNOSETUP_ALLOW_CUSTOM_DIRECTORY ON)
set(CPACK_INNOSETUP_USE_MODERN_WIZARD ON)
set(CPACK_INNOSETUP_ICON_FILE "${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.ico")
set(CPACK_INNOSETUP_ICON_FILE "${CMAKE_SOURCE_DIR}/rsrc/icons/diesel.ico")

set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
set(CPACK_GENERATOR ${CPACK_GENERATOR} INNOSETUP)
Expand All @@ -226,11 +226,11 @@ if (UNIX)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(
FILES ${CMAKE_SOURCE_DIR}/rsrc/fuel.desktop
FILES ${CMAKE_SOURCE_DIR}/rsrc/diesel.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications/
)
install(
FILES ${CMAKE_SOURCE_DIR}/rsrc/icons/fuel.png
FILES ${CMAKE_SOURCE_DIR}/rsrc/icons/diesel.png
DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps/
)
endif ()
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Fuel
Diesel
---------
Fuel is cross-platform GUI front-end for the excellent <a href="http://fossil-scm.org">Fossil</a> SCM tool written in Qt. Fuel runs on Windows, OSX as well as various flavors of Unix including Linux and FreeBSD.
Diesel is cross-platform GUI front-end for the excellent <a href="http://fossil-scm.org">Fossil</a> SCM tool written in Qt. Diesel runs on Windows, OSX as well as various flavors of Unix including Linux and FreeBSD.

### What does it look like? (V2.0.0 Beta)
![Fuel-2.0.0-Beta-Win](/doc/Fuel-2.0.0-Beta-Win.jpg)
![Diesel-2.0.0-Beta-Win](/doc/Diesel-2.0.0-Beta-Win.jpg)

## Status
Currently the following Fossil operations are supported
Expand Down
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from conan.tools.files import copy


class Fuel(ConanFile):
name = "fuel-scm"
class Diesel(ConanFile):
name = "diesel-scm"
settings = "os", "compiler", "build_type", "arch"
generators = "CMakeToolchain", "CMakeDeps"

Expand Down
10 changes: 5 additions & 5 deletions dist/arch-git/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
pkgname=fuel-git
pkgname=diesel-git
pkgver=2.0.0
pkgrel=1
pkgdesc="A GUI front-end to Fossil SCM"
arch=(i686 x86_64)
url="https://fuel-scm.org/"
url="https://diesel-scm.org/"
license=('GPL2')
depends=('qt5-base>=5.4.0' 'qt5-webengine>=5.4.0' 'fossil' 'qtkeychain-qt5')
makedepends=('git' 'cmake')
source=("git://github.com/AnotherFoxGuy/fuel-scm")
source=("git://github.com/AnotherFoxGuy/diesel-scm")
md5sums=('SKIP')

build() {
cd "$srcdir/fuel-scm"
cd "$srcdir/diesel-scm"
[ -d build ] && rm -r build
mkdir build
cd build
Expand All @@ -21,7 +21,7 @@ build() {
}

package() {
cd "$srcdir/fuel-scm/build"
cd "$srcdir/diesel-scm/build"
make DESTDIR="${pkgdir}" install
}

6 changes: 3 additions & 3 deletions dist/arch/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
pkgname=fuel
pkgname=diesel
pkgver=2.0.0
pkgrel=1
pkgdesc="A GUI front-end to Fossil SCM"
arch=(i686 x86_64)
url="https://fuel-scm.org/"
url="https://diesel-scm.org/"
license=('GPL2')
depends=('qt5-base>=5.4.0', 'qt5-webkit>=5.4.0', 'fossil', 'qtkeychain-qt5')
source=("https://fuel-scm.org/files/releases/${pkgname}-${pkgver}.tar.gz")
source=("https://diesel-scm.org/files/releases/${pkgname}-${pkgver}.tar.gz")

sha256sums=('034593d16eba9e30a73d1b40bfd4f1a7f9ba438a04dc07cc7bb2cd2202da40fc') # Generate with 'makepkg -g'

Expand Down
10 changes: 5 additions & 5 deletions dist/makedeb/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Maintainer: Edgar <Edgar{at}AnotherFoxGuy.com>
pkgname=fuel-git
pkgname=diesel-git
pkgver=2.0.0
pkgrel=1
pkgdesc="A GUI front-end to Fossil SCM"
arch=(i686 x86_64)
url="https://fuel-scm.org/"
url="https://diesel-scm.org/"
license=('GPL2')
depends=('qtbase5-dev' 'qtwebengine5-dev' 'qttools5-dev' 'fossil' 'qt5keychain-dev')
makedepends=('git' 'cmake')
source=("git://github.com/AnotherFoxGuy/fuel-scm")
source=("git://github.com/AnotherFoxGuy/diesel-scm")
md5sums=('SKIP')

build() {
cd "$srcdir/fuel-scm"
cd "$srcdir/diesel-scm"
[ -d build ] && rm -r build
mkdir build
cd build
Expand All @@ -21,7 +21,7 @@ build() {
}

package() {
cd "$srcdir/fuel-scm/build"
cd "$srcdir/diesel-scm/build"
make DESTDIR="${pkgdir}" install
}

50 changes: 25 additions & 25 deletions doc/Building.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ Building from Source

Prerequisites
-------------------------------------------------------------------------------
Building Fuel from source requires Qt version 5. Qt is available at:
Building Diesel from source requires Qt version 5. Qt is available at:
http://www.qt.io/download-open-source/

To run Fuel a compiled binary of Fossil must be available either in the system
path or in the same folder as the Fuel executable. You can find the latest
To run Diesel a compiled binary of Fossil must be available either in the system
path or in the same folder as the Diesel executable. You can find the latest
Fossil binaries from the Fossil homepage at:
https://www.fossil-scm.org/download.html

Retrieving the source
-------------------------------------------------------------------------------
The source is available as a tar.gz archive at the following location

https://fuel-scm.org/fossil/wiki?name=Downloads
https://diesel-scm.org/fossil/wiki?name=Downloads

Additionally you can clone the source code directly from our site using fossil

mkdir fuel
cd fuel
fossil clone https://fuel-scm.org/fossil fuel.fossil
fossil open fuel.fossil
mkdir diesel
cd diesel
fossil clone https://diesel-scm.org/fossil diesel.fossil
fossil open diesel.fossil


Windows (Qt5 / MinGW)
-------------------------------------------------------------------------------
1. Open a Command Prompt and cd into the folder containing the Fuel source code
1. Open a Command Prompt and cd into the folder containing the Diesel source code

cd fuel
cd diesel

2. Make a build folder and cd into it

Expand All @@ -51,9 +51,9 @@ Windows (Qt5 / MinGW)

Windows (Qt5 / MSVC)
-------------------------------------------------------------------------------
1. Open a Command Prompt and cd into the folder containing the Fuel source code
1. Open a Command Prompt and cd into the folder containing the Diesel source code

cd fuel
cd diesel

2. Make a build folder and cd into it

Expand All @@ -66,21 +66,21 @@ Windows (Qt5 / MSVC)

4. Open the generated project

start fuel.vcxproj
start diesel.vcxproj

5. Build the project
Use the IDE to build the project or alternatively you can use via MSBuild

call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
msbuild /p:Configuration=Release /m Fuel.vcxproj
msbuild /p:Configuration=Release /m Diesel.vcxproj

6. Copy the Qt DLLs

msbuild /p:Configuration=Release copy_dll.vcxproj

4. Enjoy

bin\Fuel.exe
bin\Diesel.exe


Mac OS X
Expand All @@ -91,9 +91,9 @@ Build Steps:

export PATH=$PATH:/path/to/qt/version/clang_64/bin

2. Go into the folder containing the Fuel source code
2. Go into the folder containing the Diesel source code

cd fuel
cd diesel

3. Generate the makefile with cmake

Expand All @@ -103,26 +103,26 @@ Build Steps:

make -j6

6. (Optional) Include the Fossil executable within the Fuel application bundle
6. (Optional) Include the Fossil executable within the Diesel application bundle

cp /location/to/fossil Fuel.app/Contents/MacOS
cp /location/to/fossil Diesel.app/Contents/MacOS

7. Package Qt dependencies into Fuel to make a standalone application bundle
7. Package Qt dependencies into Diesel to make a standalone application bundle

macdeployqt Fuel.app
macdeployqt Diesel.app

8. Enjoy

open Fuel.app
open Diesel.app


Unix-based OS
-------------------------------------------------------------------------------
Build Steps:

1. cd into the folder containing the Fuel source code
1. cd into the folder containing the Diesel source code

cd fuel
cd diesel

2. Make a build folder and cd into it

Expand All @@ -139,5 +139,5 @@ Build Steps:

5. Enjoy

bin/Fuel
bin/Diesel

28 changes: 14 additions & 14 deletions doc/Changes.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changes
================================================================================

Fuel V2.0.0 (2015-XX-XX)
Diesel V2.0.0 (2015-XX-XX)
--------------------------------------------------------------------------------
- Feature: New workspace view to visualise branches, tags, stashes and remotes
- Feature: Support for creating, merging and integrating branches
Expand All @@ -11,7 +11,7 @@ Fuel V2.0.0 (2015-XX-XX)
- Feature: Support for creating a branch during commit, including private branches
- Feature: Added Search Box for filtering and searching within the list of files
- Feature: Display the active tags and branches in the status bar
- Feature: Fuel now automatically detects the http port of "fossil ui"
- Feature: Diesel now automatically detects the http port of "fossil ui"
- Feature: Added menu shortcut to display only the modified files of the workspace
- Feature: Support for arbitrary number of remote urls, including pushing and
pulling to specific remotes.
Expand All @@ -29,20 +29,20 @@ Fuel V2.0.0 (2015-XX-XX)
Workspace folders
- Feature: Support for force closing a workspace
- Misc: Reorganised menu structure.
- Misc: Separated Fuel and Fossil settings
- Misc: Separated Diesel and Fossil settings
- Bug Fix: Retain the folder tree state when refreshing the workspace
- Bug Fix: Fixed issue with the expanding width of the commit dialog
- Major internal refactoring

Fuel V1.0.1 (2015-08-23)
Diesel V1.0.1 (2015-08-23)
--------------------------------------------------------------------------------
- Added Localisations:
- Italian (Thanks maxxlupi and Zangune)
- Dutch (Thanks Rick Van Lieshout and Fly Man)
- Korean (Thanks ardiefox)
- Reformated Docs into Markdown

Fuel V1.0.0 (2015-03-28)
Diesel V1.0.0 (2015-03-28)
--------------------------------------------------------------------------------
- Feature: Long Operations can now be aborted by pressing the Escape key
- Improvement: Better support for commit messages with international characters
Expand All @@ -52,12 +52,12 @@ Fuel V1.0.0 (2015-03-28)
- Russian (Thanks Mouse166)
- Portuguese (Thanks emansije)

Fuel V0.9.7 (Unreleased)
Diesel V0.9.7 (Unreleased)
--------------------------------------------------------------------------------
- Feature: Optionally use the internal browser for the Fossil UI
- Feature: Support for persisting the state (Column order and sizes) of the File View
- Feature: Dropping a Fossil checkout file or workspace folder on Fuel now opens that workspace
- Feature: Dropping a file on Fuel now adds that file to Fossil
- Feature: Dropping a Fossil checkout file or workspace folder on Diesel now opens that workspace
- Feature: Dropping a file on Diesel now adds that file to Fossil
- Feature: Commit Dialog: Pressing Ctrl-Enter within the comment box commences the commit,
and Escape aborts it
- Feature: Support for localization
Expand All @@ -67,18 +67,18 @@ Fuel V0.9.7 (Unreleased)
- Greek
- Spanish (Thanks djnavas)
- Feature: Support for QT5
- Distribution: Fuel is now available in the Arch User Repository
- Distribution: Diesel is now available in the Arch User Repository

Fuel V0.9.6 (2012-05-13)
Diesel V0.9.6 (2012-05-13)
--------------------------------------------------------------------------------
- Feature: Support for fossil stashes
- Feature: Support for dragging and dropping files out of Fuel
- Feature: Support for dragging and dropping files out of Diesel
- Feature: Allow for opening workspaces via the checkout file or a workspace folder
- Feature: Display the actual file icons
- Feature: Windows: Shift-Right-Click invokes the Explorer file context menu
- Feature: Allow starting Fuel into an existing fossil workspace via the command line (Thanks Chris)
- Feature: Portable mode. When starting Fuel with the "--portable" option all settings
will be stored in a Fuel.ini file. If a settings file already exists, Fuel will start
- Feature: Allow starting Diesel into an existing fossil workspace via the command line (Thanks Chris)
- Feature: Portable mode. When starting Diesel with the "--portable" option all settings
will be stored in a Diesel.ini file. If a settings file already exists, Diesel will start
into portable mode automatically. (Thanks Chris)
- Improvement: Always show unknown files when starting a new repository
- Bug Fix: Avoid specifying filenames explicitly when all modified files are selected.
Expand Down
File renamed without changes
Loading

0 comments on commit 6037b7c

Please sign in to comment.