Skip to content

Commit

Permalink
Merge branch 'dev/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dvorka
dvorka committed Feb 17, 2024
2 parents c3ff5f4 + 8fc13a7 commit de1da1d
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 33 deletions.
1 change: 1 addition & 0 deletions KNOWN_ISSUES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ for the complete list of bugs.

# 2.0.0

* Autolinking can crash the application on notebook or note delete (undefined link target).
* Autolinking can break MathJax code blocks/text integrity in Markdown text.
* Windows Server R2 2012: empty MF documentation repository in wrong location when MF is launched
at the end of installation.
Expand Down
16 changes: 8 additions & 8 deletions PAD.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<Program_Info>
<Program_Name>MindForger</Program_Name>
<Program_Version>2.0.0</Program_Version>
<Program_Release_Month>01</Program_Release_Month>
<Program_Release_Day>30</Program_Release_Day>
<Program_Release_Month>02</Program_Release_Month>
<Program_Release_Day>16</Program_Release_Day>
<Program_Release_Year>2024</Program_Release_Year>
<Program_Cost_Dollars />
<Program_Cost_Other_Code />
<Program_Cost_Other />
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code>0</Program_Cost_Other_Code>
<Program_Cost_Other>0</Program_Cost_Other>
<Program_Type>Freeware</Program_Type>
<Program_Release_Status>Major Update</Program_Release_Status>
<Program_Install_Support>Install and Uninstall</Program_Install_Support>
Expand Down Expand Up @@ -71,9 +71,9 @@
<Keywords>notebook, knowledge, ai, markdown, ide, ml, nlp</Keywords>
<Char_Desc_45>Thinking note taking application.</Char_Desc_45>
<Char_Desc_80>MindForger is open, free, well performing thinking note taking application with Markdown editor which respects your privacy.</Char_Desc_80>
<Char_Desc_250>Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coach</Char_Desc_250>
<Char_Desc_450>Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once</Char_Desc_450>
<Char_Desc_2000>Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once you create them? Do you know how are the remarks mutually related when you browse, read or write them? No? MindForger is open, free, well performing thinking note taking application with Markdown editor which respects your privacy.</Char_Desc_2000>
<Char_Desc_250>Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coach</Char_Desc_250>
<Char_Desc_450>Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once</Char_Desc_450>
<Char_Desc_2000>Are you drowning in information, but starving for knowledge? Where do you keep your private remarks like ideas, personal plans, exam preparation notes, gift tips, how-tos, dreams, business visions, finance strategies, meeting minutes and auto coaching notes? Loads of documents, sketches and remarks spread around the file system, cloud, web and Post-it notes? Are you affraid of your knowledge privacy? Are you able to find particular remarks once you create them? Do you know how are the remarks mutually related when you browse, read or write them? No? MindForger is open, free, well performing thinking note taking application with Markdown editor which respects your privacy.</Char_Desc_2000>
</English>
</Program_Descriptions>
<Web_Info>
Expand Down
15 changes: 7 additions & 8 deletions build/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,6 @@ gen-ui-class: ## generate UI C++ class skeleton: CLASS_NAME=My_Class
@echo "Generating UI C++ class for name: $(CLASS_NAME)"
./make/gen-cpp-ui-class.py $(CLASS_NAME)

.PHONY: devenv-debian
devenv-debian:
sudo apt-get install build-essential zlib1g-dev libhunspell-dev libqt5webkit5-dev qttools5-dev-tools ccache cmake debhelper

#
# build
Expand Down Expand Up @@ -288,13 +285,13 @@ dist-dmg: ## build macOS Disk iMaGe .dmg package
#
# Debian
#
# MindForger PPA: https://www.mindforger.com/debian is managed by aptly
# OBSOLETE: MindForger PPA: https://www.mindforger.com/debian is managed by aptly
#
# - information about MindForger's Debian PPAs can be found in
# - OBSOLETE: information about MindForger's Debian PPAs can be found in
# https://www.mindforger.com/debian/index.html
#
# - aptly CANNOT be used to build one PPA for all Debian releases
# therefore every release has it's own PPA
# therefore every release has its own PPA
#
# - the structure looks like this (from deprecated debian/ to new debian-ppa/):
#
Expand All @@ -309,6 +306,8 @@ dist-dmg: ## build macOS Disk iMaGe .dmg package
# pool/
# index.html ... created by me w/ how to set it up
#
# - Debian distributions are built in VirtualBox VMs on "mind" machine
#
# - source Debian packages for every version (which are used by aptly)
# are stored in
#
Expand All @@ -332,8 +331,8 @@ dist-dmg: ## build macOS Disk iMaGe .dmg package
# obsolete repos: jessie-main

.PHONY: dist-debian-ppa
dist-debian-aptly-create-ppa: ## create Debian PPA for current Debian release: DISTRO=bullseye
cd ./build/debian && ./debian-ppa-aptly-build.sh
dist-debian-aptly-create-ppa: ## create Debian PPA for all releases
cd ./debian && ./debian-ppa-aptly-build.sh

#
# ^ Debian
Expand Down
6 changes: 3 additions & 3 deletions build/debian/debian-ppa-aptly-build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@

#
# This script builds MindForger/HSTR Debian PPA for a particular Debian release.
# - it adds all .deb pacakges in given directory to aptly repository.
# - it adds all .deb packages in given directory to aptly repository.
#
# Usage:
#
# MF_DEBIAN_DISTRO_DIR=... MF_DEBIAN_RELEASE=... ./debian-aptly-add-deb.sh
# MF_DEBIAN_DISTRO_DIR=... MF_DEBIAN_RELEASE=... ./debian-ppa-aptly-build.sh
#
# Example:
#
# MF_DEBIAN_DEB_DIR=~/p/mindforger/debian/aptly/mindforger/12-bookworm \
# MF_DEBIAN_RELEASE=bookworm \
# ./debian-release-aptly-build.sh
# ./debian-ppa-aptly-build.sh
#
# aptly abstractions hierarchy:
#
Expand Down
43 changes: 32 additions & 11 deletions build/ubuntu/ubuntu-launchpad-releases-from-mind.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,39 +78,60 @@
# https://www.debian.org/doc/debian-policy/
#

# ########################################################################
# # Troubleshooting
# ########################################################################

# PROBLEM: build successfull, but .deb is NOT uploaded to Launchpad
# - check that .dsc file is signed using GPG
# - manually upload .dsc file from ~/p/mindforger/launchpad/* to Launchpad
# using dput:
#
# dput ppa:ultradvorka/productivity mindforger_2.0.6-0ubuntu1_source.changes
#

# ########################################################################
# # Configuration
# ########################################################################

# Ubuntu version:
# - https://wiki.ubuntu.com/Releases
# - obsolete:
# precise quantal saucy precise utopic vivid wily yakkety artful cosmic
# - current :
# (trusty) xenial bionic (cosmic disco eoan) focal (groovy) (hirsute) (impish) jammy kinetic
# - command (Bash tuple of distro names):
# trusty xenial bionic focal jammy kinetic
# precise quantal saucy precise utopic vivid wily yakkety artful cosmic kinetic
# - history (* LTS):
# trusty* xenial* bionic* (cosmic disco eoan) focal* (groovy hirsute impish)
# jammy* (kinetic lunar) mantic
# - current ~ Bash tuple below || ./ubuntu-launchpad-releases-from-mind.sh <DISTRO> + manual upload:
# trusty xenial bionic focal jammy mantic
# - NOT RELEASED (non-satisfying hunspell version - can be fixed by downgrade to libhunspell-dev (>= 1.6) in build/ubuntu/debian/control:
# trusty xenial
#
#
#
# - TODO - required hunspell version not available on older Ubuntu versions:
# ERROR: pbuilder-satisfydepends-dummy : Depends: libhunspell-dev (>= 1.6) but it is not going to be installed.
# trusty xenial bionic mantic

if [[ ${#} == 1 ]]
then
export UBUNTU_VERSIONS=(${1})
else
export UBUNTU_VERSIONS=(focal)
export UBUNTU_VERSIONS=(kinetic)
fi

# environment variables
export MAJOR_VERSION=1
export MINOR_VERSION=55
export PATCH_VERSION=5 # patch version is incremented for every Ubuntu build @ Launchpad
export MAJOR_VERSION=2
export MINOR_VERSION=0
export PATCH_VERSION=1 # patch version is incremented for every Ubuntu build @ Launchpad
export MF_VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" # semantic version
export RM_CMD="rm -vrf "
export CP_CMD="cp -vrf "

export OPT_VERBOSE="v"
if [[ ${#} == 1 ]]
then
export OPT_DO_PUSH="false" # "true" to upload src to bazaar
export OPT_DO_RELEASE="false" # "true" to dpush binary .deb to Launchpad and TRIGGER release
export OPT_DO_PUSH="true" # "true" to upload src to bazaar
export OPT_DO_RELEASE="true" # "true" to dpush binary .deb to Launchpad and TRIGGER release
else
#export OPT_DO_PUSH="false" # "true" to upload src to bazaar
#export OPT_DO_RELEASE="false" # "true" to dpush binary .deb to Launchpad and TRIGGER release
Expand Down
13 changes: 10 additions & 3 deletions build/ubuntu/ubuntu-pbuilder-add-distros.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# https://wiki.ubuntu.com/Releases
# old: precise quantal saucy precise utopic vivid wily trusty (old GCC) yakkety artful cosmic
# current: trusty xenial bionic disco eoan jammy kinetic
for DISTRO in jammy kinetic
# - obsolete:
# precise quantal saucy precise utopic vivid wily trusty (old GCC)
# yakkety artful cosmic disco eoan kinetic
# - current:
# trusty xenial bionic focal jammy mantic
#
# Distro is stored to:
# ~/pbuilder
#
for DISTRO in mantic
do
sudo pbuilder --create ${DISTRO}
rm -vf ~/pbuilder/${DISTRO}-base.tgz
Expand Down

0 comments on commit de1da1d

Please sign in to comment.