Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added XReq language to GPR configuration, and enabled XReq language b…

…y default in GPS.

This makes the feature files show in GPS.
  • Loading branch information...
commit 1d5983b0ec60ef9c89ce4e50055b15823d584a0c 1 parent d2f555a
@mildred mildred authored
Showing with 51 additions and 3 deletions.
  1. +9 −3 Makefile
  2. +42 −0 data/gprconfig.xml
View
12 Makefile
@@ -835,7 +835,7 @@ check: gnatcheck coverage run-cucumber run-unit
## ##
###################
-install: install-bin install-lib install-gps
+install: install-bin install-lib install-gps install-gpr
@echo '------------------------------------------------------------------'
@echo '-- XReq has now been installed.'
@echo '------------------------------------------------------------------'
@@ -900,10 +900,13 @@ install-gps: #lib/gps/libxreqgps.$(SUF_SO)
ifneq ($(GPSDATADIR),)
$(INSTALL) -m644 data/gps-plug-in/xreq.xml $(DESTDIR)$(GPSDATADIR)/library/xreq.xml
$(INSTALL) -m644 data/gps-plug-in/xreq.py $(DESTDIR)$(GPSDATADIR)/library/xreq.py
- $(INSTALL) -m644 data/gps-plug-in/feature-lang.xml $(DESTDIR)$(GPSDATADIR)/library/feature-lang.xml
+ $(INSTALL) -m644 data/gps-plug-in/feature-lang.xml $(DESTDIR)$(GPSDATADIR)/plug-ins/feature-lang.xml
$(INSTALL) -m755 lib/gps/libxreqgps.$(SUF_SO) $(DESTDIR)$(LIBDIR)/libxreqgps.$(SUF_SO)
endif
+install-gpr: data/gprconfig.xml
+ $(INSTALL) -m644 data/gprconfig.xml $(DESTDIR)$(DATADIR)/gprconfig/xreq.xml
+
uninstall: uninstall-gps
-$(RM) -rf $(DESTDIR)$(BINDIR)/xreq
-$(RM) -rf $(DESTDIR)$(GPRDIR)/xreqlib.gpr
@@ -925,6 +928,9 @@ ifneq ($(GPSDATADIR),)
-$(RM) -rf $(DESTDIR)$(GPSDATADIR)/library/feature-lang.xml
endif
+uninstall-gpr: data/gprconfig.xml
+ -$(RM) -rf $(DESTDIR)$(DATADIR)/gprconfig/xreq.xml
+
install-gps-local:
ln -sf "`pwd`"/data/gps-plug-in/*.{xml,py} ~/.gps/plug-ins
ln -sf "`pwd`"/lib/gps/libxreqgps.$(SUF_SO) ~/.local/lib
@@ -935,7 +941,7 @@ uninstall-gps-local:
-$(RM) ~/.gps/plug-ins/feature-lang.xml
-$(RM) ~/.local/lib/libxreqgps.$(SUF_SO)
-.PHONY: install install-lib install-bin install-gps uninstall install-gps-local uninstall-gps uninstall-gps-local
+.PHONY: install install-lib install-bin install-gps uninstall install-gps-local uninstall-gps uninstall-gps-local install-gpr uninstall-gpr
View
42 data/gprconfig.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<gprconfig>
+
+ <compiler_description>
+ <name>XReq</name>
+ <executable>xreq</executable>
+ <version>0.01git</version>
+ <languages>feature,requirement</languages>
+ </compiler_description>
+
+ <configuration>
+ <compilers>
+ <compiler language="feature" />
+ </compilers>
+ <config>
+ package Naming is
+ for Body_Suffix ("feature") use ".feature";
+ end Naming;
+ </config>
+ </configuration>
+
+ <!-- Problem: I don't know how to make gprbuild understand that feature files
+ do not build into object files but in adb/ads files. The following
+ configuration is disabled. -->
+
+ <!--
+ <configuration>
+ <compilers>
+ <compiler name="XReq" language="feature" />
+ </compilers>
+ <config>
+ package Compiler is
+ for Driver ("feature") use "${PATH(feature)}${EXEC(feature)}";
+ end Compiler;
+ package Binder is
+ for Prefix ("feature") use "xreq_f__";
+ end Binder;
+ </config>
+ </configuration>
+ -->
+
+</gprconfig>
Please sign in to comment.
Something went wrong with that request. Please try again.