Revision: 16722 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16722 Author: sirdude Date: 2008-09-25 17:39:46 +0200 (Thu, 25 Sep 2008)
Log Message: ----------- This is part of the cleanup Campbell wanted :) Just getting rid of license_key stuff. The project files still need to be updated: projectfiles_vc7/blender/src/BL_src_cre.vcproj projectfiles_vc7/blender/blendercompactNG.vcproj Just search for these files in them. Kent Modified Paths: -------------- trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp Removed Paths: ------------- trunk/blender/source/blender/include/license_key.h trunk/blender/source/blender/src/cre/license.jpeg.c trunk/blender/source/blender/src/cre/license_key.c trunk/blender/source/blender/src/pub/license_key.c Modified: trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp =================================================================== --- trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp 2008-09-25 13:17:56 UTC (rev 16721) +++ trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp 2008-09-25 15:39:46 UTC (rev 16722) @@ -34,11 +34,6 @@ #include "SND_Utils.h" #include "SoundDefines.h" #include "SND_DependKludge.h" -/* -extern "C" { -#include "license_key.h" -} -*/ #include <stdio.h> #include <stdlib.h> #include <fcntl.h> Deleted: trunk/blender/source/blender/include/license_key.h =================================================================== --- trunk/blender/source/blender/include/license_key.h 2008-09-25 13:17:56 UTC (rev 16721) +++ trunk/blender/source/blender/include/license_key.h 2008-09-25 15:39:46 UTC (rev 16722) @@ -1,92 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ -#ifndef LICENCEKEY_H -#define LICENCEKEY_H - -#define I_AM_PUBLISHER temp_val2 -#define LICENSE_KEY_VALID temp_val -#define SHOW_LICENSE_KEY rotop - -extern int LICENSE_KEY_VALID; -extern int I_AM_PUBLISHER; - -extern char * license_key_name; -extern void loadKeyboard(char * name); -extern void checkhome(void); -extern void SHOW_LICENSE_KEY(void); - -#define LICENSE_CHECK_0 (0==0) - -// Stuff from the Python files from Strubi - -typedef int (*Fptr)(void *); - -extern Fptr g_functab[]; -extern Fptr g_ptrtab[]; - -// TODO: From here on, this should be a generated header file... - -// change all KEY_FUNC values -// if you change PYKEY_TABLEN or PYKEY_SEED -// see below - -#define PYKEY_TABLEN 21 // don't change this unless needed. Other values - // may yield bad random orders - -#define PYKEY_SEED {26,8,1972} - -// these values are generated by $HOME/develop/intern/keymaker/makeseed.py -// from the above seed value. - -// DO NOT EDIT THESE VALUES BY HAND! - -#define KEY_FUNC1 12 -#define KEY_FUNC2 8 -#define KEY_FUNC3 1 -#define KEY_FUNC4 16 -#define KEY_FUNC5 20 -#define KEY_FUNC6 18 -#define KEY_FUNC7 13 -#define KEY_FUNC8 6 -#define KEY_FUNC9 9 -#define KEY_FUNC10 7 -#define KEY_FUNC11 14 -#define KEY_FUNC12 0 -#define KEY_FUNC13 5 -#define KEY_FUNC14 10 -#define KEY_FUNC15 19 -#define KEY_FUNC16 2 -#define KEY_FUNC17 11 -#define KEY_FUNC18 3 -#define KEY_FUNC19 17 -#define KEY_FUNC20 15 -#define KEY_FUNC21 4 - -#endif - Deleted: trunk/blender/source/blender/src/cre/license.jpeg.c =================================================================== --- trunk/blender/source/blender/src/cre/license.jpeg.c 2008-09-25 13:17:56 UTC (rev 16721) +++ trunk/blender/source/blender/src/cre/license.jpeg.c 2008-09-25 15:39:46 UTC (rev 16722) @@ -1,35 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -int datatoc_tonize= 0; -char datatoc_ton[]= {0}; Deleted: trunk/blender/source/blender/src/cre/license_key.c =================================================================== --- trunk/blender/source/blender/src/cre/license_key.c 2008-09-25 13:17:56 UTC (rev 16721) +++ trunk/blender/source/blender/src/cre/license_key.c 2008-09-25 15:39:46 UTC (rev 16722) @@ -1,194 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#include "license_key.h" -#include "keyed_functions.h" -#include "BKE_utildefines.h" -#include "BIF_screen.h" // splash -#include "BIF_toolbox.h" -#include <stdio.h> -#include <string.h> -#include "BLO_readfile.h" -//#include "BLO_keyStore.h" - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -int LICENSE_KEY_VALID = TRUE; -int I_AM_PUBLISHER = TRUE; - -// Python stuff - -#include "Python.h" -#include "marshal.h" -#include "compile.h" /* to give us PyCodeObject */ -#include "eval.h" /* prototype for PyEval_EvalCode */ - -#include "BPY_extern.h" -#include "IMB_imbuf.h" - -Fptr g_functab[PYKEY_TABLEN]; -Fptr g_ptrtab[PYKEY_TABLEN]; - -static int g_seed[3] = PYKEY_SEED; -static PyObject *g_module_self; -static PyObject *g_main; - - -// end Python stuff - -// **************** PYTHON STUFF ************************** -/* ----------------------------------------------------- */ -/* this is the dummy functions to demonstrate */ - -int sticky_shoes(void *vp) -{ -#ifndef NDEBUG - printf("feature not enabled: Buy our Key NOW!\n"); -#endif - return 0; -} - -/* -int key_func1(void *vp) { - printf("function 1 called\n"); -} - -*/ -int key_return_true(void *vp) { -#ifndef NDEBUG - printf("function 2 called (return true)\n"); -#endif - return 1; -} - -/* ----------------------------------------------------- */ - -/* Declarations for objects of type Fplist */ - - -#ifndef NDEBUG -void feature1(void) -{ - Fptr f; - - printf("feature 2 called\n"); - f = g_ptrtab[KEY_FUNC2]; - if (f) f(0); -} - -void feature2(void) -{ - Fptr f; - - printf("feature 3 called\n"); - f = g_ptrtab[KEY_FUNC3]; - if (f) f(0); -} - -#endif - - -/* Initialization function for the module (*must* be called initprot) */ - -static void init_ftable(void) // initializes functiontable -{ - int i; - - g_functab[0] = &key_func1; - - for (i = 1; i < PYKEY_TABLEN; i++) - { - g_functab[i] = &sticky_shoes; - } - - // for debugging perposes - /* - for (i = 0; i < PYKEY_TABLEN; i++) - { - g_functab[i] = (Fptr *) (i + 100); - } - */ -} - - -static void init_ptable(void) // initializes functiontable -{ - int i; - - for (i = 0; i < PYKEY_TABLEN; i++) - { - g_ptrtab[i] = &sticky_shoes; - } -} - - -#ifdef NDEBUG -static void print_ptable(void) -{ - int i; - - for (i = 0; i < PYKEY_TABLEN; i++) - { - printf ("index[%02d] = %08x\n", i, g_ptrtab[i]); - } -} -#endif - -static void insertname(PyObject *m,PyObject *p, char *name) -{ -} - -/* initialisation */ -static void initprot() -{ - init_ftable(); // malloc - init_ptable(); // malloc -} - -// ******************************* KEY STUFF ********************* - -void create_key_name(char * keyname) -{ -} - -void checkhome() -{ - initprot(); // initialize module and function tables - -} - -void SHOW_LICENSE_KEY(void) -{ -} - -void loadKeyboard(char * name) -{ -} Deleted: trunk/blender/source/blender/src/pub/license_key.c =================================================================== --- trunk/blender/source/blender/src/pub/license_key.c 2008-09-25 13:17:56 UTC (rev 16721) +++ trunk/blender/source/blender/src/pub/license_key.c 2008-09-25 15:39:46 UTC (rev 16722) @@ -1,444 +0,0 @@ -/** - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#include "license_key.h" -#include "keyed_functions.h" -#include "BKE_utildefines.h" -#include "BIF_screen.h" // splash -#include "BIF_toolbox.h" -#include "blenkey.h" -#include <stdio.h> -#include <string.h> - -#include "BLI_blenlib.h" - -#include "BLO_readfile.h" -#include "BLO_keyStore.h" - -#ifdef HAVE_CONFIG_H @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs