Skip to content

Commit

Permalink
work on dist
Browse files Browse the repository at this point in the history
  • Loading branch information
spk121 committed Nov 15, 2018
1 parent 0347bab commit b72818e
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 28 deletions.
14 changes: 12 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,12 @@ C_HEADERS = \
src/gi/__gi_giargument.h \
src/gi/gi_ginterface.h \
src/gi/__gi_ginterface.h \
src/gi/gi_gstruct.h
src/gi/gi_gstruct.h \
src/gi/gi_gflags.h \
src/gi/gir_xguile.h \
src/gi/__gi_gboxed.h \
src/gi/gi_gboxed.h \
src/gi/gir_callback.h

C_SOURCES = \
src/gi/__gi_gobject.c \
Expand All @@ -149,7 +154,11 @@ C_SOURCES = \
src/gi/__gi_giargument.c \
src/gi/gi_gstruct.c \
src/gi/gir_callback.c \
src/gi/gir.c
src/gi/gir.c \
src/gi/gir_xguile.c \
src/gi/__gi_gboxed.c \
src/gi/gi_gboxed.c \
src/gi/gir_callback.c

SCM_SOURCES = \
src/gi.scm
Expand Down Expand Up @@ -185,6 +194,7 @@ docs/index.html: doc/guile-gi.texi
# Tarballs

DISTFILES = $(C_SOURCES) $(C_HEADERS) $(SCM_SOURCES) \
src/gi/fo_gen.c \
doc/guile-gi.texi docs/document-1.0.1.css \
README.md AUTHORS NEWS COPYING \
Makefile Makefile.mingw ChangeLog
Expand Down
25 changes: 11 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
# Guile GI

This is pre-alpha code. It does not work at all. The API is in flux. *Do not attempt to use.*
This is a library for GNU Guile. GNU Guile is an implementation of
Scheme, which is a Lisp-like language.

This is a library for GNU Guile. GNU Guile is an implementation of Scheme,
which is a Lisp-like language.

This library hopes to allow Guile to use GObject-based libraries, such as GTK+3. GObject libraries are shared
object libraries that have been written in a standardized way to make them easy to use
from other languages. GObject libraries come with metadata that describes the
This library hopes to allow Guile to use GObject-based libraries, such
as GTK+3. GObject libraries are shared object libraries that have
been written in a standardized way to make them easy to use from other
languages. GObject libraries come with metadata that describes the
functions and procedures in the library.

Guile GI has two primary components
- (gi): which makes GObject-based libraries available from Guile
- (gobject): which allows one to write and manipulate GObject-based types in Guile

Guile GI is heavily based on PyGObject, and some of the code is a transliteration
of the code in PyGObject.
This is pre-alpha code. It barely works. The API is in flux.

This is pre-alpha code. It does not work at all. The API is in flux. Do not attempt to use.
Guile GI has two primary components
- (gi) aka gi.scm: a guile module that provides functions to parse GObject typelib files
- libguile-gi.so or libguile-gi.dll: a compiled module that contains glue code
to interface with GObject

For the moment, the docs are at https://spk121.github.io/guile-gi/
2 changes: 0 additions & 2 deletions src/gi/gi_gboxed.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ gi_gboxed_new (GType boxed_type, gpointer boxed, gboolean copy_boxed, gboolean o
SCM tp;
SCM self;

g_return_val_if_fail(boxed_type != 0, NULL);
g_return_val_if_fail(!copy_boxed || (copy_boxed && own_ref), NULL);
if (!boxed) {
return SCM_NONE;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gi/gi_gvalue.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* -*- Mode: C; c-basic-offset: 4 -*- */
#include <girepository.h>
#include "gi_gvalue.h"
#include "gi_gflags.h"
//#include "gi_gflags.h"
#include "gi_gtype.h"
#include "gir_xguile.h"
#include "gi_gobject.h"
Expand Down
Empty file modified src/gi/gi_signal_closure.h
100755 → 100644
Empty file.
18 changes: 9 additions & 9 deletions src/gi/gir_xguile.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ scm_is_list (SCM x)
int
scm_is_none (SCM x)
{
return x == SCM_NONE;
return scm_is_eq(x, SCM_NONE);
}

int
Expand Down Expand Up @@ -246,14 +246,14 @@ scm_parse_list (SCM args, const char *format, ...)
return false;
}
break;
case 'O':
if (format[i_fmt + 1] == '!') {
if (!SCM_IS_A_P(entry, (SCM) ptr)) {
sprintf(parse_error_str, "%s: arg %zu, expected a matching type", name, i_fmt);
return false;
}
}
break;
/* case 'O': */
/* if (format[i_fmt + 1] == '!') { */
/* if (!SCM_IS_A_P(entry, (SCM) ptr)) { */
/* sprintf(parse_error_str, "%s: arg %zu, expected a matching type", name, i_fmt); */
/* return false; */
/* } */
/* } */
/* break; */
case '!':
/* We don't consume an argument here. */
continue;
Expand Down

0 comments on commit b72818e

Please sign in to comment.