Skip to content

Commit

Permalink
The starting on a collab setup. Focus is only on collab between two
Browse files Browse the repository at this point in the history 
processes on a single machine at the moment. The process
fontforge-internal-collab-server must be manually started too.

Better to start and remove the rough edges later.
  • Loading branch information
@monkeyiq
monkeyiq committed Feb 25, 2013
1 parent 78f9888 commit ebab448
Show file tree
Hide file tree
Showing 28 changed files with 2,792 additions and 8 deletions.
674 changes: 674 additions & 0 deletions COPYING.gplv3
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Makefile.am
View file
Expand Up @@ -48,6 +48,10 @@ include $(top_srcdir)/mk/layout.am

SUBDIRS = inc libltdl Unicode gutils hotkeys share

if LIBZMQ
SUBDIRS += collab
endif

if GRAPHICAL_USER_INTERFACE
SUBDIRS += gdraw
endif GRAPHICAL_USER_INTERFACE
Expand Down
43 changes: 43 additions & 0 deletions collab/Makefile.am
View file
@@ -0,0 +1,43 @@
# Copyright (C) 2013 by Ben Martin
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

lib_LTLIBRARIES = libzmqcollab.la

#--------------------------------------------------------------------------

libzmqcollab_la_SOURCES = zmq_kvmsg.c zmq_kvmsg.h

libzmqcollab_la_CPPFLAGS = \
"-I$(top_builddir)/inc" \
"-I$(top_srcdir)/inc" \
$(MY_CFLAGS) $(LIBZMQ_CFLAGS) $(GLIB_CFLAGS)

libzmqcollab_la_LIBADD =
libzmqcollab_la_LDFLAGS = $(MY_CFLAGS) $(MY_LIBS) $(GLIB_LIBS) -release $(VERSION)

#--------------------------------------------------------------------------

-include $(top_srcdir)/git.mk

1 comment on commit ebab448

@JoesCat
Copy link
Contributor

@JoesCat JoesCat commented on ebab448 Mar 8, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you compile FF, you get this warning right now due to gutils/fsys.c
fsys.c: In function 'GFileWriteAll':
fsys.c:795:1: warning: control reaches end of non-void function

I was tempted to edit the file but thought best that you do it since you know what you want to happen here:
int GFileWriteAll(char* filepath, char data)
/ return 0 if good, else error value if failed /
{
FILE fp = fopen( filepath, "w" );
int i, bwrite = fwrite( data, 1, strlen(data), fp );
printf("GFileWriteAll() data.len:%d bwrite:%d\n", strlen(data), bwrite );
i=ferror(fp);
fclose(fp);
return( i );
}
just thinking out loud.... I'm guessing you might have wanted to do something like return( bwrite==strlen(data) ) but I think fwrite is going to add some formatting so it may be possible the lengths won't match depending on which OS you run on.

Please sign in to comment.