From 5d0464f2c9179b24f3caa06cd0ac2132dfd8175f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 29 Oct 2009 16:37:04 +0000 Subject: [PATCH] Add copyright licence notices to rs*.c (and appropriate notes in README and Makefile) --- yarrg/Makefile | 17 +++++++++++++---- yarrg/README | 3 ++- yarrg/rscommon.h | 27 +++++++++++++++++++++++++++ yarrg/rsmain.c | 27 ++++++++++++++++++++++++++- yarrg/rssearch.c | 27 ++++++++++++++++++++++++++- yarrg/rssql.c | 26 ++++++++++++++++++++++++++ yarrg/rsvalue.c | 27 ++++++++++++++++++++++++++- 7 files changed, 146 insertions(+), 8 deletions(-) diff --git a/yarrg/Makefile b/yarrg/Makefile index a9c833b..44441bc 100644 --- a/yarrg/Makefile +++ b/yarrg/Makefile @@ -1,4 +1,3 @@ - # This is part of ypp-sc-tools, a set of third-party tools for assisting # players of Yohoho Puzzle Pirates. # @@ -9,6 +8,12 @@ # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # +# The parts of the code used for the website (including the web/ +# directory and the rs*.[ch] which make up the routesearch program) +# are released instead under the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -31,10 +36,14 @@ DEBUG=-g CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG) -TARGETS= yarrg +TARGETS_CLIENT= yarrg +TARGETS_SERVER= routesearch +TARGETS= $(TARGETS_CLIENT) $(TARGETS_SERVER) -default: clean-other-directory $(TARGETS) -all: default routesearch +default: clean-other-directory client +client: $(TARGETS_CLIENT) +server: $(TARGETS_SERVER) +all: client server CONVERT_OBJS= convert.o ocr.o pages.o structure.o rgbimage.o resolve.o COMMON_OBJS= common.o diff --git a/yarrg/README b/yarrg/README index d5062ac..10555f4 100644 --- a/yarrg/README +++ b/yarrg/README @@ -178,7 +178,8 @@ Copyright (C) 2009 Steve Early This program is free software: you can redistribute it and/or modify it under the terms of - (a) for the website code, the GNU Affero General Public License and + (a) for the website code including the route searcher, + the GNU Affero General Public License and (b) for the rest of the code, GNU General Public License as published by the Free Software Foundation, either version 3 of each applicable the License, or (at your option) any later version. diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h index 45a5b31..237cab1 100644 --- a/yarrg/rscommon.h +++ b/yarrg/rscommon.h @@ -1,3 +1,30 @@ +/* + * Route searcher - common definitions + */ +/* + * This is part of the YARRG website, a tool for assisting + * players of Yohoho Puzzle Pirates. + * + * Copyright (C) 2009 Ian Jackson + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * Yohoho and Puzzle Pirates are probably trademarks of Three Rings and + * are used without permission. This program is not endorsed or + * sponsored by Three Rings. + */ + #ifndef RSCOMMON_H #define RSCOMMON_H diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c index 774f507..67d338b 100644 --- a/yarrg/rsmain.c +++ b/yarrg/rsmain.c @@ -1,4 +1,29 @@ -/**/ +/* + * Route searcher - command line parsing and result printing + */ +/* + * This is part of the YARRG website, a tool for assisting + * players of Yohoho Puzzle Pirates. + * + * Copyright (C) 2009 Ian Jackson + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * Yohoho and Puzzle Pirates are probably trademarks of Three Rings and + * are used without permission. This program is not endorsed or + * sponsored by Three Rings. + */ #include "rscommon.h" diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c index 1dd29e5..245070e 100644 --- a/yarrg/rssearch.c +++ b/yarrg/rssearch.c @@ -1,4 +1,29 @@ -/**/ +/* + * Route searcher - recursive iteration over all routes + */ +/* + * This is part of the YARRG website, a tool for assisting + * players of Yohoho Puzzle Pirates. + * + * Copyright (C) 2009 Ian Jackson + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * Yohoho and Puzzle Pirates are probably trademarks of Three Rings and + * are used without permission. This program is not endorsed or + * sponsored by Three Rings. + */ #include "rscommon.h" diff --git a/yarrg/rssql.c b/yarrg/rssql.c index 23b3bd0..043e34e 100644 --- a/yarrg/rssql.c +++ b/yarrg/rssql.c @@ -1,3 +1,29 @@ +/* + * Route searcher - database helper functions + */ +/* + * This is part of the YARRG website, a tool for assisting + * players of Yohoho Puzzle Pirates. + * + * Copyright (C) 2009 Ian Jackson + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * Yohoho and Puzzle Pirates are probably trademarks of Three Rings and + * are used without permission. This program is not endorsed or + * sponsored by Three Rings. + */ #include "rscommon.h" diff --git a/yarrg/rsvalue.c b/yarrg/rsvalue.c index d3ffeeb..b469378 100644 --- a/yarrg/rsvalue.c +++ b/yarrg/rsvalue.c @@ -1,4 +1,29 @@ -/**/ +/* + * Route searcher - route evaluation + */ +/* + * This is part of the YARRG website, a tool for assisting + * players of Yohoho Puzzle Pirates. + * + * Copyright (C) 2009 Ian Jackson + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + * Yohoho and Puzzle Pirates are probably trademarks of Three Rings and + * are used without permission. This program is not endorsed or + * sponsored by Three Rings. + */ #include -- 2.30.2