Skip to content

Commit

Permalink
Update to v3.03
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerfraser committed Aug 11, 2023
1 parent cc579d7 commit 7477d6e
Show file tree
Hide file tree
Showing 366 changed files with 13,368 additions and 10,931 deletions.
9 changes: 4 additions & 5 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
[mainOFF]
; disabled, stable-3.0 is the currently active branch
[main]
host = https://www.transifex.com

[bibletime.bibletime_ui]
[o:bibletime:p:bibletime:r:bibletime_ui]
file_filter = i18n/messages/bibletime_ui_<lang>.ts
source_file = i18n/messages/bibletime_ui.ts
source_lang = en
type = TS

[bibletime.handbook]
[o:bibletime:p:bibletime:r:handbook]
file_filter = i18n/handbook/handbook-<lang>.po
source_file = i18n/handbook/handbook.pot
source_lang = en
type = PO

[bibletime.howto]
[o:bibletime:p:bibletime:r:howto]
file_filter = i18n/howto/howto-<lang>.po
source_file = i18n/howto/howto.pot
source_lang = en
Expand Down
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT(bibletime CXX)
CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
PROJECT(bibletime CXX C)


######################################################
Expand All @@ -11,6 +11,7 @@ IF(MSVC) # Automatically link Qt executables to qtmain target on Windows
ENDIF()
CMAKE_POLICY(SET CMP0028 NEW)

set(Qt5Core_DIR /usr/lib64/cmake/Qt5Core)

######################################################
# Build-time user options:
Expand Down Expand Up @@ -115,8 +116,8 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
# For post-full-release versions, no suffix is used.

SET(BT_VERSION_MAJOR "3")
SET(BT_VERSION_MINOR "1")
SET(BT_VERSION_PATCH "0_dev")
SET(BT_VERSION_MINOR "0")
SET(BT_VERSION_PATCH "3")
#SET(BT_VERSION_BUILD "") # Temporarily uncomment this line for release procedures

# Determine build, if needed:
Expand Down
28 changes: 20 additions & 8 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
2022-05-14 Jaak Ristioja <[email protected]>
* Released 3.0.3.

2021-12-12 Gary Holmlund <[email protected]>
* Fix bug #357 - Toolbar buttons cannot be activated using keyboard

2021-10-05 Gary Holmlund <[email protected]>
* Fix bug #346 - macOS build does not provide version metadata

2021-08-30 Jaak Ristioja <[email protected]>
* Released 3.0.2.

2021-08-09 Gary Holmlund <[email protected]>
* Fix bug #334 - Copy text disabled on Bible Time 3.0.1 with Qt less than 5.13

Expand All @@ -20,28 +32,28 @@
2021-05-10 Gary Holmlund <[email protected]>
* Fix bug #317 - Drag'n'Drop broken in BT 3.0 in mag view and search dialog

2021-03-15 Gary Holmlund <[email protected]>
2021-13-30 Gary Holmlund <[email protected]>
* Fix bug #306 - Change sample text in settings dialog

2019-13-30 Gary Holmlund <[email protected]>
2021-02-18 Gary Holmlund <[email protected]>
* Fix bug #299 - The preview on Settings dialog displays text as red

2019-13-30 Gary Holmlund <[email protected]>
2021-12-30 Gary Holmlund <[email protected]>
* Fix bug #287 - Scrolling is exceedingly slow

2019-11-05 Gary Holmlund <[email protected]>
2020-11-05 Gary Holmlund <[email protected]>
* Fix bug #283 - Clicking on verse number should make that verse the reference box

2019-10-28 Gary Holmlund <[email protected]>
2020-10-28 Gary Holmlund <[email protected]>
* Fix bug #277 - Modules rearrange themselfs

2019-10-18 Gary Holmlund <[email protected]>
2020-10-18 Gary Holmlund <[email protected]>
* Fix bug #279 - Highlighting of choosen text

2019-09-26 Gary Holmlund <[email protected]>
2020-09-26 Gary Holmlund <[email protected]>
* Fix bug #268 - The parallel reading UI is broken in 3.0.0, when showing more than 4 versions

2019-08-06 Gary Holmlund <[email protected]>
2020-08-06 Gary Holmlund <[email protected]>
* Fix bug #260 - BIbleTime 3.0 installs /usr/bin/DisplayView.qml

2020-08-02 Jaak Ristioja <[email protected]>
Expand Down
24 changes: 19 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ You can just download and install BibleTime from
The following requirements are needed only if you want to develop BibleTime.

### BUILD REQUIREMENTS
- A C++17 compiler.
- QT 5.12+ (https://www.qt.io)
- A C++11 compiler.
- QT 5.9+ (https://www.qt.io)
- Sword 1.8.1+ (https://crosswire.org/sword)
- CLucene 2.0+ (https://clucene.sf.net)
- CLucene 0.9.19+ (https://clucene.sf.net)
- CMake 3.10+ (https://cmake.org)

### DOCUMENTATION GENERATION REQUIREMENTS (OPTIONAL)
Expand Down Expand Up @@ -51,17 +51,31 @@ English and Estonian translations only, and `-DBUILD_HOWTO_PDF=OFF` disables
generation of the howto in PDF format.


### PROCEDURE

In the toplevel directory of this package, you can find
the scripts `build-debug.sh` and `build-release.sh`.

Run `build-debug.sh` to build BibleTime in debug mode.
It will build in the directory `./build/` and install to
`./build/install/`. You can run it just there, you do not
have to install it to `/usr/`.

For a real installation, run `build-release.sh`. This will
also build in `./build/`, but then install to `/usr/local`.


## FEEDBACK

Please report any bugs your find to
[our issue tracker](https://github.com/bibletime/bibletime/issues)
or see [the BibleTime homepage](https://bibletime.info/) for additional information.
or see [the BibleTime homepage](http://www.bibletime.info/) for additional information.

## DOCUMENTATION

You can find information about BibleTime, the installation
and its usage in the following places:
- https://bibletime.info/
- http://www.bibletime.info/
- The BibleTime handbook available in the Help menu of the BibleTime application.
- There's a Bible study tutorial in the help menu.

Expand Down
45 changes: 11 additions & 34 deletions archive.sh
Original file line number Diff line number Diff line change
@@ -1,34 +1,11 @@
#!/bin/bash
set -euo pipefail

FULLNAME="bibletime-${1:-custom}"

# Use a temporary directory:
TMPDIR=$(mktemp -d)
# shellcheck disable=SC2064
trap "rm -rf '${TMPDIR}'" EXIT

make_tarball() {
COMPRESSOR="$1"
OUT="${TMPDIR}/$2"
git archive --format=tar "--prefix=${FULLNAME}/" HEAD | ${COMPRESSOR} > "${OUT}" || exit 1
BYTES=$(stat '--format=%s' "${OUT}")
PRETTY_BYTES=$(echo "${BYTES}" | awk '{s[2**30]="G";s[2**20]="M";hum[1024]="k";for(x=2**30;x>=1024;x/=1024){if($1>=x){printf "%.2f %sB",$1/x,s[x];break}}}')
MD5SUM=$(md5sum "${OUT}"|cut -b -32)
SHA1SUM=$(sha1sum "${OUT}"|cut -b -40)
SHA256SUM=$(sha256sum "${OUT}"|cut -b -64)
cat << END_OF_DETAILS
Details of $2:
File size: ${BYTES} bytes (${PRETTY_BYTES})
MD5SUM: ${MD5SUM}
SHA1SUM: ${SHA1SUM}
SHA256SUM: ${SHA256SUM}
END_OF_DETAILS
mv -i "${OUT}" .
gpg --armor --detach-sig "$2"
}

echo "Creating archives for ${FULLNAME}..."
make_tarball 'xz -9e' "${FULLNAME}.tar.xz"
make_tarball 'lzip --best' "${FULLNAME}.tar.lz"
#!/bin/sh
FULLNAME="bibletime-$1"
TARXZNAME="${FULLNAME}.tar.xz"
git archive --format=tar "--prefix=${FULLNAME}/" HEAD | xz -9e > "$TARXZNAME" || exit 1
BYTES=`stat '--format=%s' "$TARXZNAME"`
echo 'Details:'
echo " Filename: ${TARXZNAME}"
echo " File size: $BYTES bytes`echo $BYTES|awk '{s[2**30]="G";s[2**20]="M";hum[1024]="k";for(x=2**30;x>=1024;x/=1024){if($1>=x){printf " (%.2f %sB)\n",$1/x,s[x];break}}}'`"
echo " MD5SUM: `md5sum \"${TARXZNAME}\" |cut -b -32`"
echo " SHA1SUM: `sha1sum \"${TARXZNAME}\" |cut -b -40`"
echo " SHA256SUM: `sha256sum \"${TARXZNAME}\" |cut -b -64`"
19 changes: 19 additions & 0 deletions build-debug.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/sh
# This little script creates a build/ directory, enters it
# and builds BibleTime there.
#
# BibleTime will be installed to build/install and can be run
# just from there: ./build/install/bin/bibletime. It will find all
# required files.

if [ ! -d build ]; then mkdir build; fi
cd build
cmake -D CMAKE_BUILD_TYPE=Debug -D CMAKE_INSTALL_PREFIX="install/" .. || exit 1
make clean
make -j4 install || exit 1
cd ..

echo
echo "BibleTime has been installed to ./build/install."
echo "You can run it by typing ./build/install/bin/bibletime."
echo
52 changes: 17 additions & 35 deletions cmake/BTApplication.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Find packages:
#
FIND_PACKAGE(CLucene REQUIRED)
SET(REQUIRED_QT_VERSION 5.12)
SET(REQUIRED_QT_VERSION 5.9)
FIND_PACKAGE(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
FIND_PACKAGE(Qt5LinguistTools ${REQUIRED_QT_VERSION})
FIND_PACKAGE(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
Expand All @@ -20,13 +20,12 @@ FIND_PACKAGE(Sword 1.8.1 REQUIRED)
######################################################
# Build options, definitions, linker flags etc for all targets:
#
INCLUDE(BTCompileFlags)
INCLUDE(BTUseCcache)
INCLUDE(CheckIPOSupported)
CHECK_IPO_SUPPORTED(RESULT HAVE_IPO)
MESSAGE(STATUS "Interprocedural optimization support: ${HAVE_IPO}")
FUNCTION(PREPARE_CXX_TARGET target)
TARGET_COMPILE_FEATURES("${target}" PUBLIC cxx_std_17)
TARGET_COMPILE_FEATURES("${target}" PUBLIC cxx_std_11)
SET_TARGET_PROPERTIES("${target}" PROPERTIES CXX_EXTENSIONS NO)
IF(HAVE_IPO)
SET_TARGET_PROPERTIES("${target}" PROPERTIES
Expand All @@ -35,20 +34,19 @@ FUNCTION(PREPARE_CXX_TARGET target)
ENDFUNCTION()
SET(CMAKE_AUTOMOC ON)
SET(CMAKE_AUTORCC ON)
ADD_DEFINITIONS(
"-DBT_VERSION=\"${BT_VERSION_FULL}\""
"-DQT_NO_KEYWORDS"
)
ADD_DEFINITIONS("-DBT_VERSION=\"${BT_VERSION_FULL}\"")
IF("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
SET(CMAKE_AUTOMOC_MOC_OPTIONS "-DNDEBUG")
ENDIF()
IF(WIN32)
ADD_COMPILE_OPTIONS("/Zi")
ELSE()
ADD_COMPILE_OPTIONS(
"-O2" "-ggdb" "-Wall" "-Wextra"
"-ggdb" "-Wall" "-Wextra"
"$<$<STREQUAL:$<CONFIGURATION>,Release>:-O2>"
"$<$<STREQUAL:$<CONFIGURATION>,Release>:-DNDEBUG>"
"$<$<STREQUAL:$<CONFIGURATION>,Release>:-DQT_NO_DEBUG>"
"$<$<NOT:$<STREQUAL:$<CONFIGURATION>,Release>>:-fno-omit-frame-pointer>"
)
ENDIF()
UNSET(BibleTime_CXXFLAGS)
Expand All @@ -61,7 +59,7 @@ ELSE()
SET(CMAKE_CXX_FLAGS_RELEASE "")
SET(CMAKE_CXX_FLAGS_DEBUG "")
IF(APPLE)
SET(T "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/")
SET(T "/Applications/Xcode_12.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/")
LIST(APPEND BibleTime_CXXFLAGS
"-mmacosx-version-min=10.12"
"-stdlib=libc++"
Expand All @@ -76,17 +74,16 @@ ENDIF()


######################################################
# bibletime_backend object library. This mostly exists for the purpose of
# keeping the backend and frontend as separate modules with no GUI dependencies
# or frontend code in the backend.
# bibletime_backend static library. Shared between the bibletime app and all
# tests:
#
FILE(GLOB_RECURSE bibletime_BACKEND_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/src/backend/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/backend/*.h"
"${CMAKE_CURRENT_SOURCE_DIR}/src/util/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/util/*.h"
)
ADD_LIBRARY(bibletime_backend OBJECT ${bibletime_BACKEND_SOURCES})
ADD_LIBRARY(bibletime_backend STATIC ${bibletime_BACKEND_SOURCES})
GET_SOURCE_FILE_PROPERTY(d
"${CMAKE_CURRENT_SOURCE_DIR}/src/util/directory.cpp" COMPILE_DEFINITIONS)
IF(DEFINED BT_RUNTIME_DOCDIR)
Expand All @@ -105,27 +102,6 @@ TARGET_COMPILE_OPTIONS(bibletime_backend
${BibleTime_CXXFLAGS}
${Sword_CFLAGS_OTHER}
)
BtAddCxxCompilerFlags(bibletime_backend PUBLIC
"-Walloca"
"-Wextra-semi"
"-Wformat=2"
"-Wformat-signedness"
"-Wfloat-equal"
"-Wformat"
"-Wlogical-op"
"-Wno-packed"
"-Wno-padded"
"-Wno-switch-enum"
"-Wpointer-arith"
"-Wsuggest-override"
"-Wunused-parameter"
"-Wzero-as-null-pointer-constant"
"-fasynchronous-unwind-tables"
"-fcf-protection=full"
"-fstack-clash-protection"
"-fstack-protector-strong"
"-pipe"
)
TARGET_INCLUDE_DIRECTORIES(bibletime_backend
PRIVATE
${CLucene_INCLUDE_DIR} #CLucene headers
Expand Down Expand Up @@ -211,15 +187,21 @@ INSTALL(FILES "pics/startuplogo.png" "pics/startuplogo_christmas.png"
# Linux: application icon and desktop file:
INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/bibletime.svg"
DESTINATION "${BT_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "info.bibletime.BibleTime.svg")


CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/linux/bibletime.desktop.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop" @ONLY)
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/bibletime.desktop"
DESTINATION "${BT_DATAROOTDIR}/applications/" RENAME "info.bibletime.BibleTime.desktop")

INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/linux/info.bibletime.BibleTime.metainfo.xml"

CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/linux/info.bibletime.BibleTime.metainfo.xml"
"${CMAKE_CURRENT_BINARY_DIR}/info.bibletime.BibleTime.metainfo.xml" @ONLY)
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/info.bibletime.BibleTime.metainfo.xml"
DESTINATION "${BT_DATAROOTDIR}/metainfo/")



IF(MSVC) # Windows:
# sword locale information
FILE(GLOB INSTALL_SWORD_LOCALE_LIST "${Sword_INCLUDE_DIRS}/../../share/sword/locales.d/*")
Expand Down
2 changes: 2 additions & 0 deletions cmake/BTBinaryPackageMacOS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ IF(APPLE)
SET(MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/Info.plist")
SET(BT_MAC_APP "${CMAKE_INSTALL_PREFIX}/BibleTime.app")

SET(INFO_FILE ${BT_MAC_APP}/Contents/Info.plist)
INSTALL(CODE "
EXECUTE_PROCESS(COMMAND ${QT_MACDEPLOYQT_EXECUTABLE} ${BT_MAC_APP} -qmldir=${CMAKE_CURRENT_SOURCE_DIR}/src/frontend/display/modelview)
CONFIGURE_FILE( ${INFO_FILE} ${INFO_FILE})
")
ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release")

Expand Down
6 changes: 3 additions & 3 deletions cmake/BTBinaryPackageWindows.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ IF(WIN32 AND NOT UNIX)

SET(CPACK_PACKAGE_NAME "BibleTime")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BibleTime for Windows")
SET(CPACK_PACKAGE_VENDOR "https://bibletime.info")
SET(CPACK_PACKAGE_VENDOR "http://www.bibletime.info")
SET(CPACK_PACKAGE_VERSION_MAJOR ${BT_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${BT_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${BT_VERSION_PATCH})
Expand Down Expand Up @@ -59,8 +59,8 @@ IF(WIN32 AND NOT UNIX)
SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\pics\\\\icons\\\\bibletime.png")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\bibletime.exe")
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
SET(CPACK_NSIS_HELP_LINK "https:\\\\\\\\bibletime.info")
SET(CPACK_NSIS_URL_INFO_ABOUT "https:\\\\\\\\bibletime.info")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.bibletime.info")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.bibletime.info")
SET(CPACK_NSIS_CONTACT "[email protected]")
SET(CPACK_NSIS_MODIFY_PATH OFF)
SET(CPACK_GENERATOR "NSIS")
Expand Down
Loading

0 comments on commit 7477d6e

Please sign in to comment.