ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/globals.h
(Generate patch)

Comparing AE/Installer/trunk/source/globals.h (file contents):
Revision 500 by iritscen, Sun Mar 14 23:31:14 2010 UTC vs.
Revision 565 by iritscen, Tue Jun 1 13:13:59 2010 UTC

# Line 9 | Line 9
9   \***************************************************************************/
10  
11  
12 < #pragma mark INCLUDES
12 > //#pragma mark INCLUDES
13   #include <fstream>
14   #include <string>
15   #include <stdio.h>
# Line 18 | Line 18
18   #include <vector>
19   #include <errno.h>
20   #include <sstream>
21 – #include "boost/thread.hpp"
22 – #include "boost/tokenizer.hpp"
23 – #include "boost/lexical_cast.hpp" // int -> string
24 – #include "boost/algorithm/string.hpp"
25 – #include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
26 – using namespace boost::filesystem;
27 – using namespace std;
21   #ifdef WIN32
22   #include <windows.h>
23   #else // assume we're on Mac
# Line 38 | Line 31 | using namespace std;
31   #ifndef WX_PRECOMP
32   #include "wx/wx.h"
33   #endif
34 + #include "boost/thread.hpp"
35 + #include "boost/tokenizer.hpp"
36 + #include "boost/lexical_cast.hpp" // int -> string
37 + #include "boost/algorithm/string.hpp"
38 + #include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
39 + using namespace boost::filesystem;
40 + using namespace std;
41  
42 – #pragma mark DEFINES
43 – #define INSTALLER_VERSION                "1.1" // only place in source we need to set this
42   #define UPDATE_LOG_READ_ERR             -1
43   #define UPDATE_INST_REPL_ERR    -2
44   #define UPDATE_MNTH_REQD_ERR    -3
# Line 49 | Line 47 | using namespace std;
47   #define UPDATE_GLOB_AVAIL                2
48   #define UPDATE_INST_AVAIL                3
49   #define UPDATE_CONT_UPD                  4
50 + #define UPDATE_PKG_AVAIL                 5
51  
53 – #pragma mark STRUCTS
52   struct ModPackage
53   {
54          bool    isInstalled; // replace with function
55          string  installerVersion;
56          string  name;
57          string  modStringName;
58 <        int     modStringVersion;
58 >        float   modStringVersion;
59 >        string  platform;
60          bool    hasOnis;
61          bool    hasDeltas;
62          bool    hasBSL;
# Line 89 | Line 88 | struct Install_info_cfg
88          Install_info_cfg();
89   };
90  
92 –
93 – #pragma mark PROTOTYPES
91   void recompileAll(vector<string>);
92   int globalizeData(void);
93   bool CheckForGlobalization(bool);
94   int GetUpdateStatus(Install_info_cfg *, Install_info_cfg *, bool *);
95   bool ProcessInstallerUpdate(Install_info_cfg *, Install_info_cfg *);
96   bool ProcessAEUpdate(Install_info_cfg *, Install_info_cfg *, bool *);
97 + void ProcessPackageUpdates(string, string);
98   void callRefreshMods(void);
99   string escapePath(string input);
100   void setStatusArea(string);
101   void setProgressBar(int);
102   void copy_directory(const path &from_dir_ph, const path &to_dir_ph);
103   void copy(const path &from_file_ph, const path &to_file_ph);
104 +
105 + static string gInstallerVersion = "1.11"; // only place in source we need to change this

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)