From d092f9ffa8fbdc33671dd0551cba010415c885eb Mon Sep 17 00:00:00 2001 From: pabs Date: Tue, 18 Dec 2007 03:22:37 +0000 Subject: [PATCH] Strip license key and software expiry stuff now that Synfig is free software and out of alpha testing. git-svn-id: http://svn.voria.com/code@1212 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/configure.ac | 3 --- synfig-core/trunk/m4/subs.m4 | 32 ----------------------------- synfig-core/trunk/macosxbuild.sh | 1 - synfig-core/trunk/src/synfig/general.h | 13 ------------ synfig-core/trunk/src/synfig/loadcanvas.cpp | 3 --- synfig-core/trunk/src/synfig/main.cpp | 10 --------- synfig-core/trunk/win32build.sh | 1 - 7 files changed, 63 deletions(-) diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index 6eb99c9..5d14e6f 100644 --- a/synfig-core/trunk/configure.ac +++ b/synfig-core/trunk/configure.ac @@ -45,14 +45,12 @@ AC_LANG_CPLUSPLUS # -- A R G U M E N T S ---------------------------------------- -AC_ARG_TIMELIMIT AC_ARG_DEBUG AC_ARG_OPTIMIZATION AC_ARG_WARNINGS AC_ARG_PROFILING AC_ARG_PROFILE_ARCS AC_ARG_BRANCH_PROBABILITIES -dnl AC_ARG_LICENSE_KEY AC_ARG_ENABLE(g5opt,[ --enable-g5opt enable optimizations specific to G5 proc],[ @@ -603,7 +601,6 @@ Install Prefix -------------------> $prefix Module directory -----------------> $moduledir Build Platform -------------------> $build Host Platform --------------------> $host -Time Limit -----------------------> $death_time Arc Profiling --------------------> $profile_arcs GProf Profiling ------------------> $profiling Debug Mode -----------------------> $debug ($debug_flags) diff --git a/synfig-core/trunk/m4/subs.m4 b/synfig-core/trunk/m4/subs.m4 index 491a277..79df5c1 100644 --- a/synfig-core/trunk/m4/subs.m4 +++ b/synfig-core/trunk/m4/subs.m4 @@ -178,38 +178,6 @@ AC_DEFUN([AC_ARG_PROFILING], AC_MSG_RESULT([$profiling]) ]) -AC_DEFUN([AC_ARG_TIMELIMIT], -[ - AC_ARG_ENABLE(timelimit,[ --enable-timelimit=[[days]] Set number of usable days(default=forever)],[ - death_time=$((`date +%s`+$enableval*60*60*24)) - AC_DEFINE_UNQUOTED(DEATH_TIME,$death_time, [ Describes the time at which the library will stop working ] ) - ], - [ - death_time="no" - ]) -]) - -AC_DEFUN([AC_ARG_LICENSE_KEY], -[ - AC_ARG_ENABLE(license_key,[ --enable-license-key Turn on license key requirement],[ - AC_DEFINE(LICENSE_KEY_REQUIRED,, [ Enables license key checks ] ) - ], - [ - license_key=no - ]) -]) - -AC_DEFUN([AC_ARG_TIMELIMIT], -[ - AC_ARG_ENABLE(timelimit,[ --enable-timelimit=[[days]] Set number of usable days(default=forever)],[ - death_time=$((`date +%s`+$enableval*60*60*24)) - AC_DEFINE_UNQUOTED(DEATH_TIME,$death_time, [ Describes the time at which the library will stop working ] ) - ], - [ - death_time="no" - ]) -]) - MINGW_FLAGS="-mno-cygwin" diff --git a/synfig-core/trunk/macosxbuild.sh b/synfig-core/trunk/macosxbuild.sh index b43b49c..bc418b9 100755 --- a/synfig-core/trunk/macosxbuild.sh +++ b/synfig-core/trunk/macosxbuild.sh @@ -6,7 +6,6 @@ PREFIX=/Users/darco/Projects/Voria/synfig-build export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11R6/lib/pkgconfig OPTIONS="--prefix=$PREFIX" -#OPTIONS="$OPTIONS --enable-timelimit=120" #OPTIONS="$OPTIONS --enable-optimization=2" OPTIONS="$OPTIONS --enable-optimization=3" #OPTIONS="$OPTIONS --enable-g5opt" diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h index 238f78e..86d1172 100644 --- a/synfig-core/trunk/src/synfig/general.h +++ b/synfig-core/trunk/src/synfig/general.h @@ -117,19 +117,6 @@ public: virtual bool valid() const { return cb != 0; } }; -/*! \class SoftwareExpired -** \brief This class is thrown when the software timeout has been reached. -*/ -class SoftwareExpired -{ -}; // END of class SoftwareExpired - - -#ifdef DEATH_TIME -inline void CHECK_EXPIRE_TIME() { if(time(0)>DEATH_TIME) throw SoftwareExpired(); } -#else -#define CHECK_EXPIRE_TIME() while(0){ } -#endif /* extern bool add_to_module_search_path(const std:string &path); diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp index 8db2a5d..49cf6bc 100644 --- a/synfig-core/trunk/src/synfig/loadcanvas.cpp +++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp @@ -2069,7 +2069,6 @@ CanvasParser::parse_from_file(const String &file) Canvas::Handle CanvasParser::parse_from_file_as(const String &file_,const String &as_) { - CHECK_EXPIRE_TIME(); try { ChangeLocale change_locale(LC_NUMERIC, "C"); @@ -2130,8 +2129,6 @@ CanvasParser::parse_from_file_as(const String &file_,const String &as_) Canvas::Handle CanvasParser::parse_from_string(const String &data) { - CHECK_EXPIRE_TIME(); - try { ChangeLocale change_locale(LC_NUMERIC, "C"); diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index f3cb717..4de4e72 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -55,10 +55,6 @@ #include "mutex.h" -#ifdef DEATH_TIME -#include -#endif - #ifdef HAVE_SIGNAL_H #include #endif @@ -117,8 +113,6 @@ synfig::check_version_(int version,int vec_size, int color_size,int canvas_size, { bool ret=true; - CHECK_EXPIRE_TIME(); - if(version!=SYNFIG_LIBRARY_VERSION) { synfig::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SYNFIG_LIBRARY_VERSION,version); @@ -221,8 +215,6 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): bindtextdomain("synfig", LOCALEDIR); - CHECK_EXPIRE_TIME(); - String prefix=basepath+"/.."; unsigned int i; #ifdef _DEBUG @@ -345,8 +337,6 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): // load_modules(cb); - CHECK_EXPIRE_TIME(); - if(cb)cb->amount_complete(100, 100); if(cb)cb->task(_("DONE")); diff --git a/synfig-core/trunk/win32build.sh b/synfig-core/trunk/win32build.sh index a9817b5..bdc8a34 100755 --- a/synfig-core/trunk/win32build.sh +++ b/synfig-core/trunk/win32build.sh @@ -3,7 +3,6 @@ #OPTIONS="--disable-optimization --enable-debug" OPTIONS="--enable-optimization=1 --disable-debug" -#OPTIONS="$OPTIONS --enable-timelimit=120" [ -e configure ] || ./bootstrap || exit 0 -- 2.7.4