Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LibreCAD 3 CI/CD changes #394

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
04c4ba5
Learning In Progress
CRiSTiK24 Jun 6, 2022
1310c04
Started Windows Workflow
CRiSTiK24 Jun 9, 2022
a39840c
Last thing to get windows build is finding a way to use cmake as in V…
CRiSTiK24 Jun 9, 2022
65c172d
Corrected Lua Path, added install comand in cmakeLists root folder
CRiSTiK24 Jun 21, 2022
184b549
See v0.0.1 patchnotes in release
CRiSTiK24 Jun 21, 2022
3356e8e
progress of the week. Removed extra files and made everything be in b…
CRiSTiK24 Jun 26, 2022
37edd83
updates in some files, the installer using external paths still fails
CRiSTiK24 Jun 29, 2022
e30d79e
003 version push
CRiSTiK24 Jul 8, 2022
da592de
Fixed small problems that I changed for the Windows installation that…
Jul 9, 2022
4e0fb19
More linux content towards the repo
Jul 10, 2022
56d794f
solved Desktop shortcut problem, VC redistributables and automatic in…
CRiSTiK24 Jul 10, 2022
dcd3b84
Changes for linux build
Jul 17, 2022
fb8a651
more fixes and scripts
CRiSTiK24 Jul 17, 2022
62f7e7a
I hope i don't overwrite any change. settings_PATH changes
CRiSTiK24 Jul 17, 2022
e2d217f
more tries, on windows doasn't work. Want to check on linux
CRiSTiK24 Jul 20, 2022
3a612e1
New changes, still not functional
Jul 23, 2022
9bafe59
checkpoint push
Jul 24, 2022
14b6fa2
Deadlock when building in windows
CRiSTiK24 Jul 24, 2022
6124396
Exe appended, cpp files modified for it
CRiSTiK24 Jul 28, 2022
648fdd4
cleaning of the changes
CRiSTiK24 Jul 28, 2022
07eceff
AppImage working :)
Jul 28, 2022
85cc563
Update and rename WindowsInstall.yml to main.yml
CRiSTiK24 Jul 29, 2022
cc020f4
identation
CRiSTiK24 Jul 29, 2022
c575a26
More indentation fix
CRiSTiK24 Jul 29, 2022
b37c052
small naming fix
CRiSTiK24 Jul 29, 2022
fa1236b
Update main.yml
CRiSTiK24 Jul 29, 2022
a295f5d
Update main.yml
CRiSTiK24 Jul 29, 2022
efd3e4b
Update main.yml
CRiSTiK24 Jul 29, 2022
7e7010f
A2
CRiSTiK24 Aug 5, 2022
cf92c93
Merge branch 'master' of https://github.com/CRiSTiK24/AddCI-CDLibreCAD_3
CRiSTiK24 Aug 5, 2022
76c1a2c
this compiles succesfully, but doasn't use new path
Aug 5, 2022
edb3ece
no crash, pushing to check it out with strace
CRiSTiK24 Aug 7, 2022
c75e5cd
linux appImage kinda works
Aug 7, 2022
6324fd3
Snap and AppImage functional on VM
Aug 7, 2022
8a567c3
Snap Script
Aug 8, 2022
83d04a5
Create main.yml
CRiSTiK24 Aug 8, 2022
6643698
moved path before creating painters
CRiSTiK24 Aug 8, 2022
38b66ed
Restructuration towars using scripts instead of raw code
CRiSTiK24 Aug 10, 2022
820c5bd
changed the way to call github variables
CRiSTiK24 Aug 11, 2022
9682263
error checkout corrected
CRiSTiK24 Aug 11, 2022
bec8529
Solved issues in the script
CRiSTiK24 Aug 11, 2022
4b3114d
Added necesary code that I deleted before
CRiSTiK24 Aug 11, 2022
a5a2198
copying a lib in linux + solving qt action problem
CRiSTiK24 Aug 11, 2022
fa1e3ed
More little changes
CRiSTiK24 Aug 12, 2022
26df18b
more little changes
CRiSTiK24 Aug 12, 2022
1ae9822
another try at win qt action
CRiSTiK24 Aug 16, 2022
3f97de1
modification to windows script 4 paths
CRiSTiK24 Aug 16, 2022
a540567
small fix on the Powershell set path
CRiSTiK24 Aug 16, 2022
dc49d15
Trying out if run does execute Powershell commands natively
CRiSTiK24 Aug 16, 2022
e37b5ce
error with YAML syntax
CRiSTiK24 Aug 16, 2022
828e280
moving command in a powershell script
CRiSTiK24 Aug 16, 2022
701e75c
I left a line with name by mistake, I remove it
CRiSTiK24 Aug 16, 2022
dcfc0ef
Modified build script to not us github actions variables as cmake arg…
CRiSTiK24 Aug 16, 2022
ad6b5dc
It needs the recursive checkout in windows too
CRiSTiK24 Aug 17, 2022
2042317
Also forgot that RelDebwithInfo is no longer created. Hopefully this …
CRiSTiK24 Aug 17, 2022
6ac83cc
The path to upload the artifact was wrong, changing it now
CRiSTiK24 Aug 17, 2022
e8e0b68
The path to upload the artifact was wrong, changing it now
CRiSTiK24 Aug 17, 2022
862b09e
path seems to need to be absolute
CRiSTiK24 Aug 18, 2022
fa27392
Windows build works! Patching paths to the linux one
CRiSTiK24 Aug 18, 2022
72e1531
It still can't find libdxfrw library, trying with another argument
CRiSTiK24 Aug 18, 2022
50d1e00
adding libdxfrw libs to path. Maybe this way it will find it
CRiSTiK24 Aug 18, 2022
dd7ddac
trying out again moving libdrfx.so.1 inside manually
CRiSTiK24 Aug 18, 2022
440b0f6
another try at getting the library dxfrw
CRiSTiK24 Aug 19, 2022
52a1937
The last try may have failed because the variable tha t stored the pa…
CRiSTiK24 Aug 19, 2022
bfa1a81
path to libdxfrw incorrect, writing one in another way
CRiSTiK24 Aug 19, 2022
c4a1375
libdxfrw solved! now qmake doasn't find qt, so exporting a variable t…
CRiSTiK24 Aug 19, 2022
a39c6b2
exporting the path is not enough, installing qt5-default seems to cre…
CRiSTiK24 Aug 19, 2022
97f3eba
default snapcraft versions seems to lack needed files. Removing it an…
CRiSTiK24 Aug 19, 2022
2e3c19c
using the --classic argument, maybe this way it works
CRiSTiK24 Aug 19, 2022
3594f2a
another try at reinstalling snapcraft from snapstore
CRiSTiK24 Aug 19, 2022
54e30cb
path towards libdx... in snapcraft yaml can't take relative paths ( l…
CRiSTiK24 Aug 19, 2022
2aa2653
changing name of the snap, so the artifact can be found and uploaded
CRiSTiK24 Aug 19, 2022
62989cb
Remembered why I didn't use LibreCAD3 as a name. It isn't allowed. Ch…
CRiSTiK24 Aug 19, 2022
5b1ca22
Trying 20.04 build
CRiSTiK24 Aug 19, 2022
ada2e8f
I guess this are the changes needed for ubunut 20.04
CRiSTiK24 Aug 19, 2022
30046e8
libglew is 2.1 in 20.04. Changing it at the snap
CRiSTiK24 Aug 19, 2022
470c49a
cmake is broken. Kitware workaround should not be needed anymore, so …
CRiSTiK24 Aug 19, 2022
89219b3
forgot that snapcraft.yaml had a reference to the version. Moving it …
CRiSTiK24 Aug 19, 2022
9867142
Also core20 uses a different way to pass cmake parameters
CRiSTiK24 Aug 19, 2022
6f83cbe
the snap needs an extra ld path to find the libdxfr
CRiSTiK24 Aug 20, 2022
9ec72c7
Cleaned all the comented code or uneficient paths
CRiSTiK24 Aug 24, 2022
9af2da8
Merge branch 'LibreCAD:master' into master
CRiSTiK24 Aug 24, 2022
28b6657
code factor corrections
CRiSTiK24 Aug 24, 2022
372fddb
Merge branch 'master' of https://github.com/CRiSTiK24/AddCI-CDLibreCAD_3
CRiSTiK24 Aug 24, 2022
b21fb20
Second round of codefactoring
CRiSTiK24 Aug 24, 2022
7999412
deleting unneded scripts. Changing the names of the ones still used. …
CRiSTiK24 Aug 28, 2022
dd70887
had a path to script wrong, trying again
CRiSTiK24 Aug 28, 2022
f78ea3b
Forgot to add a "/" in a path
CRiSTiK24 Aug 28, 2022
ae80500
Trying out LUACMDINTERFACE ON, to see if it builds now
CRiSTiK24 Aug 29, 2022
4fc29b2
Trying to run a debug run to solve windows issue
CRiSTiK24 Aug 30, 2022
9b3835a
libboost also needs to be installed in debug mode. Trying to set it f…
CRiSTiK24 Aug 30, 2022
c4011f0
Both installs must be debug
CRiSTiK24 Aug 30, 2022
281fa2e
some packages are missing for debug, trying to let connan build those
CRiSTiK24 Aug 30, 2022
a9398ed
Going back on the changes, adding conan to build missing packages
CRiSTiK24 Sep 2, 2022
2371210
I forgot about changing CPack back to RelWithDebInfo
CRiSTiK24 Sep 6, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleaned all the comented code or uneficient paths
  • Loading branch information
CRiSTiK24 committed Aug 24, 2022
commit 9ec72c75bae4ce9b504501028c9fc33c8b40b495
18 changes: 2 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,8 @@ set(CMAKE_CXX_STANDARD 14)

set(Boost_USE_MULTITHREADED ON)

# settings path
IF (WIN32)

set(SETTINGS_PATH "") #The settings will be at the same place as executable.

ELSEIF (UNIX)

set(SETTINGS_PATH "") #In AppImages, it has to be relative to the AppRun, not librecad

ENDIF()

# Add dirent.h if compiler is MSVC
if(MSVC)
Expand Down Expand Up @@ -217,18 +209,12 @@ install(
DESTINATION ${CMAKE_INSTALL_BINDIR} # install librecad in the bin folder of the installer
)

install(FILES "${CMAKE_SOURCE_DIR}/luaPath/win/path.lua"
DESTINATION ${CMAKE_INSTALL_BINDIR}
)

ELSEIF(UNIX) #else if it's linux.
ENDIF()

install(FILES "${CMAKE_SOURCE_DIR}/luaPath/unix/path.lua"
install(FILES "${CMAKE_SOURCE_DIR}/path.lua"
DESTINATION ${CMAKE_INSTALL_BINDIR}
)

ENDIF()

#Get shaders and fonts
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/lcviewernoqt/painters/opengl/resources/shaders
Expand Down
7 changes: 0 additions & 7 deletions lcUI/lcadviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,12 @@ void LCADViewer::initializeGL()
QString sPathToShaders = QCoreApplication::applicationDirPath() + "/../resources/shaders/";
QString sPathToFonts = QCoreApplication::applicationDirPath() + "/../resources/fonts/";

//const char* cPathToShaders = sPathToShaders.toLocal8Bit().constData();
//const char* cPathToFonts = sPathToFonts.toLocal8Bit().constData();

auto pathToShaders = lc::storage::settings::StringSettingValue(sPathToShaders.toStdString());
auto pathToFonts = lc::storage::settings::StringSettingValue(sPathToFonts.toStdString());

(lc::viewer::setShader(pathToShaders));
(lc::viewer::setFont(pathToFonts));

//lc::viewer::opengl::SHADER_PATH = cPathToShaders;
//lc::viewer::opengl::FONT_PATH = cPathToFonts;


QOpenGLWidget::makeCurrent();
QOpenGLContext *CC= QOpenGLContext::currentContext();

Expand Down
2 changes: 1 addition & 1 deletion lcadluascript/managers/pluginmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PluginManager::PluginManager(lua_State* l, const char* interface) :
}

void PluginManager::loadPlugins() {
const char* path = "../finalInstallDir/usr/share/librecad/lcUILua/plugins/"; //TODO: changed
const char* path = "../finalInstallDir/usr/share/librecad/lcUILua/plugins/";

DIR* dir;
struct dirent* ent;
Expand Down
3 changes: 1 addition & 2 deletions lckernel/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 2.8.11)
project(LCKERNEL)

#TODO: Fix this

set(PATTERN_RESOURCE_PATH ${FINAL_INSTALL_DIR}/usr/share/librecad/res/hatch)
install(DIRECTORY "${CMAKE_SOURCE_DIR}/res/hatch"
DESTINATION "${FINAL_INSTALL_DIR}/usr/share/librecad"
Expand Down
9 changes: 0 additions & 9 deletions lckernel/cad/storage/settings/modulesettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ class ModuleSettings {

virtual ~ModuleSettings();


/**
* @brief Set the atribute pathToExe and recalculate path to json settings
*
* @param pathToExe String towards the exe
*/
//void setExePath(std::string pathToExe);


/**
* @brief Return setting value
* @param name Name of the setting
Expand Down
8 changes: 0 additions & 8 deletions lcviewernoqt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ painters/opengl/manager.cpp
painters/opengl/cacher.cpp
painters/opengl/renderer.cpp
painters/opengl/shader.cpp
#painters/opengl/resources/res.cpp

)

Expand Down Expand Up @@ -142,13 +141,6 @@ include_directories(

message("OpenGL include dir: ${OPENGL_INCLUDE_DIR}")

# creating res.cpp for path of opengl resources

#add_custom_command(
# PRE_BUILD
# OUTPUT ${PROJECT_SOURCE_DIR}/painters/opengl/resources/res.cpp
# COMMAND ${CMAKE_COMMAND} -DDIR=${CMAKE_CURRENT_SOURCE_DIR} -P "${PROJECT_SOURCE_DIR}/painters/opengl/cmake/FindOpenGLRes.cmake"
#)

# Boost logging
find_package(Boost REQUIRED COMPONENTS log)
Expand Down
13 changes: 0 additions & 13 deletions lcviewernoqt/viewersettings.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
//#pragma once



#pragma once

#include <cad/storage/settings/modulesettings.h>
Expand All @@ -20,12 +16,3 @@ namespace lc {
#endif //VIEWERSETTINGS_SETTERS
}
}

/*
ModuleSettings viewerSettings({
{SETTINGS_GL_SHADER_PATH, &StringSettingValue("pathNotSet")},
{SETTINGS_GL_FONT_PATH, &StringSettingValue("pathNotSet")}
});

*/
//#endif //VIEWERSETTINGS_H
4 changes: 0 additions & 4 deletions luaPath/win/path.lua

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions scripts/ubuntu-install/1.install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ sudo apt update
sudo apt upgrade
sudo apt install cmake qt5-default qttools5-dev qttools5-dev-tools libqt5opengl5-dev liblua5.2-dev git g++ libcairo2-dev libpango-1.0-0 libpango1.0-dev libboost-dev libboost-log-dev libboost-program-options-dev libqt5svg5-dev libgtest-dev libeigen3-dev libcurl4-gnutls-dev libgtk-3-dev libglew-dev rapidjson-dev libbz2-dev libglfw3-dev libglm-dev

#This is for versions older that 20.04, like ubuntu 18.04

#sudo apt remove --purge --auto-remove cmake
#sudo apt update && \
Expand Down