Skip to content

Commit 276e4aa

Browse files
sea5kgsea5kg
committed
Merge branch 'dev'
2 parents a66cf81 + 8884144 commit 276e4aa

22 files changed

Lines changed: 297 additions & 187 deletions

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@ All notable changes to wsjcpp project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [v0.2.4] - 2025-01-18 (2025 Jan 18)
9+
10+
### Added
11+
12+
- Added set permissions for build_simple.sh on init
13+
- Added temporary fix for init package
14+
- Added hint about change version on init new package
15+
- Added license to files
16+
17+
### Fixed
18+
19+
- Fix urls
20+
21+
### Changed
22+
23+
- Change minimal version fo c++ from 11 to 17 (it's need for wsjcpp-core)
24+
825
## [v0.2.3] - 2025-01-13 (2025 Jan 13)
926

1027
### Added

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019-2021 Evgenii Sopov
3+
Copyright (c) 2019-2024 Evgenii Sopov
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ $ sudo apt-get install wsjcpp
4343
$ sudo apt install cmake make g++ pkg-config libcurl4-openssl-dev git-core
4444
$ git clone https://github.com/wsjcpp/wsjcpp /tmp/wsjcpp.git
4545
$ cd /tmp/wsjcpp.git
46-
$ ./build_simple.sh
4746
$ sudo cp -r /tmp/wsjcpp.git /bin/wsjcpp
4847
```
4948

@@ -58,8 +57,6 @@ $ sudo cp -r /tmp/wsjcpp.git /bin/wsjcpp
5857
Inside with your folder project
5958
```
6059
$ wsjcpp init .
61-
$ chmod +x build_simple.sh
62-
$ chmod +x unit-tests.wsjcpp/build_simple.sh
6360
```
6461

6562
If you already have a project and want integrate to you project please look here: TODO

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.3
1+
0.2.4

‎contrib/ppa/build_source_pkg_for_ppa.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@
1414
# https://wiki.ubuntu.com/Releases
1515

1616
dists.append({
17-
"name": "Ubuntu 16.04.7 LTS (xenial)",
18-
"dist_name": "xenial",
19-
"ppa_name_suffix": "ppa-ubuntu-16-04-xenial-1",
20-
"end": "April 2021",
21-
"version": "16.04.7 LTS"
17+
"name": "Ubuntu 20.04.6 LTS (focal)",
18+
"dist_name": "focal",
19+
"ppa_name_suffix": "ppa-ubuntu-20-04-focal-3",
20+
"end": "April 2025",
21+
"version": "20.04.6 LTS"
2222
})
2323

2424
dists.append({
25-
"name": "Ubuntu 18.04.5 LTS (bionic)",
26-
"dist_name": "bionic",
27-
"ppa_name_suffix": "ppa-ubuntu-18-04-bionic-2",
28-
"end": "April 2023",
29-
"version": "18.04.5 LTS"
25+
"name": "Ubuntu 22.04.5 LTS (Jammy Jellyfish)",
26+
"dist_name": "jammy",
27+
"ppa_name_suffix": "ppa-ubuntu-22-04-jammy-1",
28+
"end": "June 2027",
29+
"version": "22.04.5 LTS"
3030
})
3131

3232
dists.append({
33-
"name": "Ubuntu 20.04.2 LTS (focal)",
34-
"dist_name": "focal",
35-
"ppa_name_suffix": "ppa-ubuntu-20-04-focal-2",
36-
"end": "April 2025",
37-
"version": "20.04.2 LTS"
33+
"name": "Ubuntu 24.04.1 LTS (Noble Numbat)",
34+
"dist_name": "noble",
35+
"ppa_name_suffix": "ppa-ubuntu-24-04-noble-1",
36+
"end": "June 2029",
37+
"version": "24.04.1 LTS"
3838
})
3939

4040
dists.append({
41-
"name": "Ubuntu 21.04 (Hirsute Hippo)",
42-
"dist_name": "hirsute",
43-
"ppa_name_suffix": "ppa-ubuntu-21-04-hirsute-1",
44-
"end": "January 2022",
45-
"version": "20.10"
41+
"name": "Ubuntu 24.10 (Oracular Oriole)",
42+
"dist_name": "oracular",
43+
"ppa_name_suffix": "ppa-ubuntu-24-10-oracular-1",
44+
"end": "July 2025",
45+
"version": "24.10"
4646
})
4747

4848
print("Please choose dist name:")
@@ -192,7 +192,7 @@ def copytree(src, dst, symlinks=False, ignore=None):
192192

193193
dput_filename = "wsjcpp_" + current_version + "-" + ppa_name_ + "_source.changes"
194194

195-
if os.system("debsign -k 3AA3105C5766233DD2F243A3A742BE2E628592AC " + dput_filename) != 0:
195+
if os.system("debsign -k 3D21BC44D45E5F8EF600C917EC70B82B65A9E3FA " + dput_filename) != 0:
196196
print( " -> FAILED ")
197197
sys.exit(-1)
198198

‎contrib/ppa/debian/copyright‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
####################################################################
2-
# wsjcpp #
3-
####################################################################
1+
####################################################################
2+
# wsjcpp #
3+
####################################################################
44

55
MIT License
66

‎contrib/ppa/debian/rules‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
#!/usr/bin/make -f
1+
#!/usr/bin/make -f
22

3-
# secondly called by launchpad
3+
# secondly called by launchpad
44
build:
55
cmake .
66
make
77

8-
# thirdly called by launchpad
9-
binary: binary-indep binary-arch
8+
# thirdly called by launchpad
9+
binary: binary-indep binary-arch
1010

1111
binary-indep:
1212
# nothing to be done
1313

14-
binary-arch:
14+
binary-arch:
1515
pwd
1616
mkdir -p debian/tmp/usr/bin
1717
cp -f wsjcpp debian/tmp/usr/bin/
1818
mkdir debian/tmp/DEBIAN
1919
dpkg-gencontrol -pwsjcpp
2020
dpkg --build debian/tmp ..
2121

22-
# firstly called by launchpad
22+
# firstly called by launchpad
2323
clean:
2424
rm -f CMakeCache.txt
2525
rm -rf CMakeFiles/

‎samples/wsjcpp.with-build-server.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ build-server:
1515
auth: no
1616
workdir: "/home/user-wsjcpp/guitar-solo-part-generator"
1717
my-build-server:
18-
host: "sea-kg.com"
18+
host: "wsjcpp.org"
1919
port: "51755"
2020
auth: simple
2121
workdir: "/home/user1/guitar-solo-part-generator" # может сделать через переменные окружения ?
2222
enviroment:
2323
- SOME: 111
2424
my-build-server2:
25-
host: "sea-kg.com"
25+
host: "wsjcpp.org"
2626
port: "220"
2727
auth: ssh # тут можно попробовать че нить типа как в постгре сделать
2828
workdir: "/home/user0/guitar-solo-part-generator"

‎samples/wsjcpp.with-docker-section.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ authors:
4848
email: "mrseakg@gmail.com" # add validate email format
4949

5050
origins:
51-
- address: "https://sea-kg.com/wsjcpp-package-registry/"
51+
- address: "https://wsjcpp.org/wsjcpp-package-registry/"
5252
type: package-registry
5353
- address: "file:///usr/share/wsjcpp-package-registry"
5454
type: local-file-system # must be in global ~/.wsjcpp/config.yml

‎src.wsjcpp/CMakeLists.txt‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Automaticly generated by wsjcpp@v0.2.3
1+
# Automaticly generated by wsjcpp@v0.2.4
22
cmake_minimum_required(VERSION 3.0)
33

4-
add_definitions(-DWSJCPP_APP_VERSION="v0.2.3")
4+
add_definitions(-DWSJCPP_APP_VERSION="v0.2.4")
55
add_definitions(-DWSJCPP_APP_NAME="wsjcpp")
66

77
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
88
set(MACOSX TRUE)
99
endif()
1010

11-
set(CMAKE_CXX_STANDARD 11)
11+
set(CMAKE_CXX_STANDARD 17)
1212

1313
set (WSJCPP_LIBRARIES "")
1414
set (WSJCPP_INCLUDE_DIRS "")
@@ -18,38 +18,38 @@ find_package(Threads REQUIRED)
1818
list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
1919

2020
# wsjcpp-core:v0.2.1
21-
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_core/")
22-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
23-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")
21+
list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_core/")
22+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
23+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_core/wsjcpp_core.h")
2424

2525
# wsjcpp-yaml:v0.1.6
26-
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_yaml/")
27-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_yaml/wsjcpp_yaml.cpp")
28-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_yaml/wsjcpp_yaml.h")
26+
list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_yaml/")
27+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_yaml/wsjcpp_yaml.cpp")
28+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_yaml/wsjcpp_yaml.h")
2929

3030
# wsjcpp-hashes:v0.1.4
31-
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_hashes/")
32-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_hashes/md5.cpp")
33-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_hashes/md5.h")
34-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_hashes/smallsha1.h")
35-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_hashes/smallsha1.cpp")
36-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.cpp")
37-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.h")
31+
list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_hashes/")
32+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_hashes/md5.cpp")
33+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_hashes/md5.h")
34+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_hashes/smallsha1.h")
35+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_hashes/smallsha1.cpp")
36+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.cpp")
37+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_hashes/wsjcpp_hashes.h")
3838

3939
# wsjcpp-safe-scripting:v0.1.0
40-
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_safe_scripting/")
41-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_safe_scripting/wsjcpp_safe_scripting.h")
42-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_safe_scripting/wsjcpp_safe_scripting.cpp")
40+
list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_safe_scripting/")
41+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_safe_scripting/wsjcpp_safe_scripting.h")
42+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_safe_scripting/wsjcpp_safe_scripting.cpp")
4343

4444
# wsjcpp-arguments:v0.2.1
45-
list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_arguments/")
46-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_arguments/wsjcpp_arguments.cpp")
47-
list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_arguments/wsjcpp_arguments.h")
45+
list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_arguments/")
46+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_arguments/wsjcpp_arguments.cpp")
47+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/./src.wsjcpp/wsjcpp_arguments/wsjcpp_arguments.h")
4848

4949
# resources.wsjcpp
50-
list (APPEND WSJCPP_INCLUDE_DIRS "./src-resources.wsjcpp/")
51-
list (APPEND WSJCPP_SOURCES "./src-resources.wsjcpp/__build_simple_sh_pathd79e07.h")
52-
list (APPEND WSJCPP_SOURCES "./src-resources.wsjcpp/__build_simple_sh_pathd79e07.cpp")
50+
list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src-resources.wsjcpp/")
51+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/src-resources.wsjcpp/__build_simple_sh_pathd79e07.h")
52+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/src-resources.wsjcpp/__build_simple_sh_pathd79e07.cpp")
5353

5454
# required-libraries
5555
list (APPEND WSJCPP_LIBRARIES "-lpthread")

0 commit comments

Comments
 (0)