[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47164] trunk/blender: finish cleanup for plugins
Campbell Barton
ideasman42 at gmail.com
Tue May 29 12:31:42 CEST 2012
Revision: 47164
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47164
Author: campbellbarton
Date: 2012-05-29 10:31:42 +0000 (Tue, 29 May 2012)
Log Message:
-----------
finish cleanup for plugins
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenlib/BLI_path_util.h
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/creator/creator.c
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/SConstruct 2012-05-29 10:31:42 UTC (rev 47164)
@@ -667,42 +667,6 @@
scriptinstall.append(env.Install(dir=dir, source=source))
-#-- plugins
-pluglist = []
-plugtargetlist = []
-for tp, tn, tf in os.walk('release/plugins'):
- if '.svn' in tn:
- tn.remove('.svn')
- if '_svn' in tn:
- tn.remove('_svn')
- df = tp[8:] # remove 'release/'
- for f in tf:
- pluglist.append(os.path.join(tp, f))
- plugtargetlist.append( os.path.join(env['BF_INSTALLDIR'], VERSION, df, f) )
-
-
-# header files for plugins
-pluglist.append('source/blender/blenpluginapi/documentation.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'documentation.h'))
-pluglist.append('source/blender/blenpluginapi/externdef.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'externdef.h'))
-pluglist.append('source/blender/blenpluginapi/floatpatch.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'floatpatch.h'))
-pluglist.append('source/blender/blenpluginapi/iff.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'iff.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.h'))
-pluglist.append('source/blender/blenpluginapi/util.h')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'util.h'))
-pluglist.append('source/blender/blenpluginapi/plugin.DEF')
-plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
-
-plugininstall = []
-# plugins in blender 2.5 don't work at the moment.
-#for targetdir,srcfile in zip(plugtargetlist, pluglist):
-# td, tf = os.path.split(targetdir)
-# plugininstall.append(env.Install(dir=td, source=srcfile))
-
textlist = []
texttargetlist = []
for tp, tn, tf in os.walk('release/text'):
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-05-29 10:31:42 UTC (rev 47164)
@@ -57,7 +57,6 @@
#include "RNA_access.h"
/* **** XXX **** */
-static void error(const char *UNUSED(error), ...) {}
/* Glow effect */
enum {
Modified: trunk/blender/source/blender/blenlib/BLI_path_util.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_path_util.h 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/source/blender/blenlib/BLI_path_util.h 2012-05-29 10:31:42 UTC (rev 47164)
@@ -54,13 +54,11 @@
#define BLENDER_USER_CONFIG 31
#define BLENDER_USER_DATAFILES 32
#define BLENDER_USER_SCRIPTS 33
-#define BLENDER_USER_PLUGINS 34
-#define BLENDER_USER_AUTOSAVE 35
+#define BLENDER_USER_AUTOSAVE 34
/* system */
#define BLENDER_SYSTEM_DATAFILES 52
#define BLENDER_SYSTEM_SCRIPTS 53
-#define BLENDER_SYSTEM_PLUGINS 54
#define BLENDER_SYSTEM_PYTHON 54
/* for BLI_get_folder_version only */
Modified: trunk/blender/source/blender/imbuf/IMB_imbuf.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_imbuf.h 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf.h 2012-05-29 10:31:42 UTC (rev 47164)
@@ -416,8 +416,6 @@
/**
*
* \attention defined in readimage.c
- * \deprecated Only here for backwards compatibility of the
- * \deprecated plugin system.
*/
struct ImBuf *IMB_loadifffile(int file, int flags, const char *descr);
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c 2012-05-29 10:31:42 UTC (rev 47164)
@@ -1374,7 +1374,7 @@
}
/*
- if (count == 3) { // not used by any effects ...except maybe plugins?
+ if (count == 3) { // not used by any effects (perhaps one day plugins?)
prop = RNA_def_property(srna, "input_3", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "seq3");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL);
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt 2012-05-29 10:31:42 UTC (rev 47164)
@@ -101,8 +101,7 @@
bf_rna
bf_bmesh
bf_blenkernel
- bf_blenloader
- bf_blenpluginapi
+ bf_blenloader
ge_blen_routines
bf_editor_datafiles
ge_converter
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/source/creator/CMakeLists.txt 2012-05-29 10:31:42 UTC (rev 47164)
@@ -395,14 +395,6 @@
)
endif()
- # plugins in blender 2.6 don't work at the moment.
- #
- # install(
- # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
- # DESTINATION ${TARGETDIR_VER}
- # PATTERN ".svn" EXCLUDE
- # )
-
if(WITH_PYTHON)
if(WITH_PYTHON_INSTALL)
# on some platforms (like openSUSE) Python is linked
@@ -482,14 +474,6 @@
endif()
endif()
- # plugins in blender 2.6 don't work at the moment.
- #
- # install(
- # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
- # DESTINATION ${TARGETDIR_VER}
- # PATTERN ".svn" EXCLUDE
- # )
-
if(WITH_PYTHON)
set_lib_path(PYLIB "python/lib")
install(
@@ -857,7 +841,6 @@
bf_blenlib
bf_intern_ghost
bf_intern_string
- bf_blenpluginapi
bf_avi
bf_imbuf_cineon
bf_imbuf_openexr
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2012-05-29 10:21:07 UTC (rev 47163)
+++ trunk/blender/source/creator/creator.c 2012-05-29 10:31:42 UTC (rev 47164)
@@ -261,7 +261,6 @@
BLI_argsPrintArgDoc(ba, "--env-system-config");
BLI_argsPrintArgDoc(ba, "--env-system-datafiles");
BLI_argsPrintArgDoc(ba, "--env-system-scripts");
- BLI_argsPrintArgDoc(ba, "--env-system-plugins");
BLI_argsPrintArgDoc(ba, "--env-system-python");
printf("\n");
BLI_argsPrintArgDoc(ba, "-nojoystick");
@@ -1136,7 +1135,6 @@
/* TODO, add user env vars? */
BLI_argsAdd(ba, 1, NULL, "--env-system-datafiles", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_DATAFILES)" environment variable", set_env, NULL);
BLI_argsAdd(ba, 1, NULL, "--env-system-scripts", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_SCRIPTS)" environment variable", set_env, NULL);
- BLI_argsAdd(ba, 1, NULL, "--env-system-plugins", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_PLUGINS)" environment variable", set_env, NULL);
BLI_argsAdd(ba, 1, NULL, "--env-system-python", "\n\tSet the "STRINGIFY_ARG (BLENDER_SYSTEM_PYTHON)" environment variable", set_env, NULL);
/* second pass: custom window stuff */
More information about the Bf-blender-cvs
mailing list