finish cleanup for plugins
authorCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 10:31:42 +0000 (10:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 10:31:42 +0000 (10:31 +0000)
SConstruct
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenlib/BLI_path_util.h
source/blender/imbuf/IMB_imbuf.h
source/blender/makesrna/intern/rna_sequencer.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c

index bbf3dff03940cc4afc068de524f19ec705e3d488..cf88a4b9b7defdd20f7883bbe98941a8f3cfd2b3 100644 (file)
@@ -667,42 +667,6 @@ if env['OURPLATFORM']=='linuxcross':
 
     scriptinstall.append(env.Install(dir=dir, source=source))
 
 
     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'):
 textlist = []
 texttargetlist = []
 for tp, tn, tf in os.walk('release/text'):
index cea041eb294dc80a0f1f84eec5154162bf5c1946..4b6c362cd8525a0997b6441a6a9a73168ba6f77a 100644 (file)
@@ -57,7 +57,6 @@
 #include "RNA_access.h"
 
 /* **** XXX **** */
 #include "RNA_access.h"
 
 /* **** XXX **** */
-static void error(const char *UNUSED(error), ...) {}
 
 /* Glow effect */
 enum {
 
 /* Glow effect */
 enum {
index 3664d7bcd771199f2565c0ec0ba438d35f91197b..74f5e7fc2bdf024f3821297a7d8760ff32bd49f2 100644 (file)
@@ -54,13 +54,11 @@ char *BLI_get_folder_version(const int id, const int ver, const int do_check);
 #define BLENDER_USER_CONFIG         31
 #define BLENDER_USER_DATAFILES      32
 #define BLENDER_USER_SCRIPTS        33
 #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
 
 /* 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 */
 #define BLENDER_SYSTEM_PYTHON       54
 
 /* for BLI_get_folder_version only */
index d79f0a3bf2c09360f4e5de382b64f9a010d904a0..1a68d3c1f09ee1183a65280e3b719160e2f1e24f 100644 (file)
@@ -416,8 +416,6 @@ void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char *col, flo
 /**
  *
  * \attention defined in readimage.c
 /**
  *
  * \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);
 
  */  
 struct ImBuf *IMB_loadifffile(int file, int flags, const char *descr);
 
index 8632c663b01cf864d1b25de6cbf7d76130487b09..9082bb42be54b9a77ba1a022af729425edb759b4 100644 (file)
@@ -1374,7 +1374,7 @@ static void rna_def_effect_inputs(StructRNA *srna, int count)
        }
 
        /*
        }
 
        /*
-       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);
                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);
index cfccd92ef86c41bbcee7b32f01eec407d5bf6501..674d5540c8ba83d2b2aa1c6f8fbc05ba91e2eddf 100644 (file)
@@ -101,8 +101,7 @@ endif()
                bf_rna
                bf_bmesh
                bf_blenkernel
                bf_rna
                bf_bmesh
                bf_blenkernel
-               bf_blenloader 
-               bf_blenpluginapi 
+               bf_blenloader
                ge_blen_routines
                bf_editor_datafiles
                ge_converter 
                ge_blen_routines
                bf_editor_datafiles
                ge_converter 
index 02d19398a7a133bc1e643c8d4dba59cf7ca6c7a0..74ccda8ce0ed26e7c7981679c890bff06764253f 100644 (file)
@@ -395,14 +395,6 @@ if(UNIX AND NOT APPLE)
                )
        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)
                if(WITH_PYTHON_INSTALL)
                        # on some platforms (like openSUSE) Python is linked
        if(WITH_PYTHON)
                if(WITH_PYTHON_INSTALL)
                        # on some platforms (like openSUSE) Python is linked
@@ -482,14 +474,6 @@ elseif(WIN32)
                endif()
        endif()
 
                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(
        if(WITH_PYTHON)
                set_lib_path(PYLIB "python/lib")
                install(
@@ -857,7 +841,6 @@ endif()
                bf_blenlib
                bf_intern_ghost
                bf_intern_string
                bf_blenlib
                bf_intern_ghost
                bf_intern_string
-               bf_blenpluginapi
                bf_avi
                bf_imbuf_cineon
                bf_imbuf_openexr
                bf_avi
                bf_imbuf_cineon
                bf_imbuf_openexr
index 4294ddc8febd912d5ecbe8aaf8f1b084d5edba33..0cdbeb940b8fafe63db1facec8c5a9c04c6316ec 100644 (file)
@@ -261,7 +261,6 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data)
        BLI_argsPrintArgDoc(ba, "--env-system-config");
        BLI_argsPrintArgDoc(ba, "--env-system-datafiles");
        BLI_argsPrintArgDoc(ba, "--env-system-scripts");
        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");
        BLI_argsPrintArgDoc(ba, "--env-system-python");
        printf("\n");
        BLI_argsPrintArgDoc(ba, "-nojoystick");
@@ -1136,7 +1135,6 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
        /* 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);
        /* 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 */
        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 */