Permalink
Browse files

Update /release files

Auto generate /release files via script
Add /release files to VS2008 project
Make VS2008 build /dev or /release depending on target config.
  • Loading branch information...
1 parent 5f3434f commit 938ede80679aa6dc85ae9381922e56ee176be1b9 @jerejones jerejones committed Jul 9, 2012
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -891,12 +891,15 @@ PHP_METHOD(Phalcon_Controller_Front, getInstance);
PHP_METHOD(Phalcon_Controller_Front, reset);
PHP_METHOD(Phalcon_Session, start);
+PHP_METHOD(Phalcon_Session, destroy);
PHP_METHOD(Phalcon_Session, setOptions);
PHP_METHOD(Phalcon_Session, get);
PHP_METHOD(Phalcon_Session, set);
PHP_METHOD(Phalcon_Session, has);
PHP_METHOD(Phalcon_Session, remove);
PHP_METHOD(Phalcon_Session, getId);
+PHP_METHOD(Phalcon_Session, started);
+PHP_METHOD(Phalcon_Session, exists);
PHP_METHOD(Phalcon_Flash, _showMessage);
PHP_METHOD(Phalcon_Flash, error);
@@ -2743,6 +2746,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_start, 0, 0, 0)
ZEND_ARG_INFO(0, options)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_destroy, 0, 0, 0)
+ ZEND_ARG_INFO(0, delete_cookie)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_session_setoptions, 0, 0, 1)
ZEND_ARG_INFO(0, options)
ZEND_END_ARG_INFO()
@@ -3872,12 +3879,15 @@ PHALCON_INIT_FUNCS(phalcon_controller_front_functions){
PHALCON_INIT_FUNCS(phalcon_session_functions){
PHP_ME(Phalcon_Session, start, arginfo_phalcon_session_start, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ PHP_ME(Phalcon_Session, destroy, arginfo_phalcon_session_destroy, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Session, setOptions, arginfo_phalcon_session_setoptions, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Session, get, arginfo_phalcon_session_get, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Session, set, arginfo_phalcon_session_set, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Session, has, arginfo_phalcon_session_has, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Session, remove, arginfo_phalcon_session_remove, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Phalcon_Session, getId, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ PHP_ME(Phalcon_Session, started, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+ PHP_ME(Phalcon_Session, exists, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_FE_END
};
View
@@ -23,24 +23,24 @@
#define PHP_PHALCON_VERSION "0.4.2"
#define PHP_PHALCON_EXTNAME "phalcon"
-#define PHALCON_MAX_MEMORY_STACK 64
+#define PHALCON_MAX_MEMORY_STACK 48
#define PHALCON_FCALL_MAX_CACHE 96
typedef struct _phalcon_memory_entry {
- int pointer;
- zval **addresses[PHALCON_MAX_MEMORY_STACK];
- struct _phalcon_memory_entry *prev;
- struct _phalcon_memory_entry *next;
+ int pointer;
+ zval **addresses[PHALCON_MAX_MEMORY_STACK];
+ struct _phalcon_memory_entry *prev;
+ struct _phalcon_memory_entry *next;
} phalcon_memory_entry;
ZEND_BEGIN_MODULE_GLOBALS(phalcon)
- int phalcon_memory_stack;
- phalcon_memory_entry *start_memory;
- phalcon_memory_entry *active_memory;
- zend_fcall_info_cache *phalcon_fcall_cache[PHALCON_FCALL_MAX_CACHE];
+ int phalcon_memory_stack;
+ phalcon_memory_entry *start_memory;
+ phalcon_memory_entry *active_memory;
+ zend_fcall_info_cache *phalcon_fcall_cache[PHALCON_FCALL_MAX_CACHE];
#ifndef PHALCON_RELEASE
- int phalcon_stack_stats;
- int phalcon_fcall_stats;
+ int phalcon_stack_stats;
+ int phalcon_fcall_stats;
#endif
ZEND_END_MODULE_GLOBALS(phalcon)
@@ -51,23 +51,26 @@ ZEND_END_MODULE_GLOBALS(phalcon)
ZEND_EXTERN_MODULE_GLOBALS(phalcon)
#ifdef ZTS
- #define PHALCON_GLOBAL(v) TSRMG(phalcon_globals_id, zend_phalcon_globals *, v)
+ #define PHALCON_GLOBAL(v) TSRMG(phalcon_globals_id, zend_phalcon_globals *, v)
#else
- #define PHALCON_GLOBAL(v) (phalcon_globals.v)
+ #define PHALCON_GLOBAL(v) (phalcon_globals.v)
#endif
extern zend_module_entry phalcon_module_entry;
#define phpext_phalcon_ptr &phalcon_module_entry
+#ifdef PHP_WIN32
+#include "stdafx.h"
+#endif
+
#endif
#if PHP_VERSION_ID >= 50400
- #define PHALCON_INIT_FUNCS(class_functions) static const zend_function_entry class_functions[] =
+ #define PHALCON_INIT_FUNCS(class_functions) static const zend_function_entry class_functions[] =
#else
- #define PHALCON_INIT_FUNCS(class_functions) static const function_entry class_functions[] =
+ #define PHALCON_INIT_FUNCS(class_functions) static const function_entry class_functions[] =
#endif
#ifndef PHP_FE_END
- #define PHP_FE_END { NULL, NULL, NULL, 0, 0 }
+ #define PHP_FE_END { NULL, NULL, NULL, 0, 0 }
#endif
-
View
@@ -17,8 +17,12 @@ Building Phalcon In Windows
5. Select configuration that matches your thread safety
6. Build and enjoy
-
Updating the project when files are added or removed from /dev
==============================================================
-In the /win32/scripts directory, there is a batch file that will scan the /dev directory and update cphalcon.vproj.
+In the /win32/scripts directory, there is an update-project.bat batch file that will scan the /dev directory and update cphalcon.vproj.
+
+Building the Release configs
+==============================================================
+
+Do not edit the files in the /release directory. Instead edit the files in the dev directory. When you want to build the release config, run the create-release-src-files.bat batch file in /win32/scripts. That will rejoin (almost) all the files in /dev and create the files in /release.
Oops, something went wrong.

0 comments on commit 938ede8

Please sign in to comment.