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.

Sign up for GitHub

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

Proposal 202201. #139

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Proposal 202201. #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e75a162
GNATDoc and GNATStudio_CLI: use XDG_DATA_DIRS to get share folder in …
Blady-Com Nov 29, 2022
da911b5
Fix configure test logic when GTKAda testing.
Blady-Com Nov 29, 2022
7172108
Fix configure test of Python minor version greater than 9.
Blady-Com Nov 29, 2022
b2716cb
Fix configure library list setting for Python.
Blady-Com Nov 29, 2022
b6206aa
Change withed VSS path of dap.gpr like other ones.
Blady-Com Nov 29, 2022
7a3a36b
Fix compatibility with Python 3.10.
Blady-Com Dec 1, 2022
e1a89ef
Add BUILD variable needed by GPRBUILD_BUILD_TYPE_FLAGS.
Blady-Com Dec 1, 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
7 changes: 6 additions & 1 deletion cli/src/gps-cli_kernels.adb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
with GNATCOLL.Projects;
with GNATCOLL.Utils;

with Ada.Environment_Variables;

package body GPS.CLI_Kernels is

---------------------
Expand Down Expand Up @@ -59,11 +61,14 @@ package body GPS.CLI_Kernels is
return GNATCOLL.VFS.Virtual_File
is
pragma Unreferenced (Self);
use Ada.Environment_Variables;

Dir : GNATCOLL.VFS.Virtual_File :=
Create (+GNATCOLL.Utils.Executable_Location);
begin
if Dir.Base_Dir_Name = "obj" then
if Exists ("XDG_DATA_DIRS") then
Dir := Create (+(Value ("XDG_DATA_DIRS")) & "/gnatstudio/");
elsif Dir.Base_Dir_Name = "obj" then
Dir := Create_From_Dir (Dir.Get_Parent.Get_Parent, "share/");
else
Dir := Create_From_Dir (Dir, "share/gnatstudio/");
Expand Down
13 changes: 10 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4387,7 +4387,14 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GtkAda - version >= $min_gtk_version" >&5
$as_echo_n "checking for GtkAda - version >= $min_gtk_version... " >&6; }

if test "$GNATDRV" = "no" -o ! `$GNATDRV ls -Pgtkada` ; then
test ! "$GNATDRV" = "no"
retval=$?
if test $retval -eq 0 ; then
$GNATDRV ls -Pgtkada > /dev/null
retval=$?
fi

if test $retval -ne 0 ; then
no_gtk=yes
else
# Full version number
Expand Down Expand Up @@ -4579,7 +4586,7 @@ $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
if ${am_cv_python_version+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
am_cv_python_version=`$PYTHON -c "import sys,re; sys.stdout.write(re.findall(r'(\d+\.\d+)\.', sys.version)[0])"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
Expand Down Expand Up @@ -5101,7 +5108,7 @@ See \`config.log' for more details" "$LINENO" 5; }



value=$PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LDFLAGS
value="$PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LDFLAGS"

# Special handling on darwin for gcc 4.5 and 4.7
case "$build_os" in
Expand Down
2 changes: 1 addition & 1 deletion dap/dap.gpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ with "../refactoring/ui/refactoring_ui";
with "../views/views";
with "../browsers/browsers";
with "../gvd/gvd";
with "../subprojects/VSS/gnat/vss_text";
with "vss_text";

project DAP is

Expand Down
2 changes: 1 addition & 1 deletion share/support/core/gs_utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# exported by GPS to make it easier to write plugins

from GPS import pwd, cd, Action, EditorBuffer, MDI
from collections import MutableMapping as DictMixin
from collections.abc import MutableMapping as DictMixin
import types
import GPS
import GPS.Browsers
Expand Down
1 change: 1 addition & 0 deletions testsuite/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
GPRBUILD=gprbuild
GPRCLEAN=gprclean
BUILD?=Debug

SYS := $(shell gcc -dumpmachine)
ifeq ($(OS),Windows_NT)
Expand Down