Merge pull request #360 from ayuer/force_republish

Fix issue #329, Force republish
cocos2d · May 13, 2013 · 26b1136 · 26b1136
2 parents e46061b + 05c0368
commit 26b1136
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/CocosBuilder/ccBuilder/CCBPublisher.m b/CocosBuilder/ccBuilder/CCBPublisher.m
@@ -816,6 +816,13 @@ - (BOOL) publishAllToDirectory:(NSString*)dir
     publishedResources = [NSMutableSet set];
     renamedFiles = [NSMutableDictionary dictionary];
 
+    //Remove old dir if we need to re-publish due to version mismatch
+    if (projectSettings.needRepublish)
+    {
+        NSFileManager *fm = [NSFileManager defaultManager];
+        [fm removeItemAtPath:dir error:NULL];
+    }
+
     // Setup paths for automatically generated sprite sheets
     generatedSpriteSheetDirs = [NSMutableArray array];
     for (NSString* dir in projectSettings.generatedSpriteSheets)
@@ -1088,6 +1095,12 @@ - (BOOL) publish_
         }
     }
 
+    // Once published, set needRepublish back to NO
+    if (projectSettings.needRepublish)
+    {
+        projectSettings.needRepublish = NO;
+        [projectSettings store];
+    }
     return YES;
 }
 

diff --git a/CocosBuilder/ccBuilder/CocosBuilderAppDelegate.m b/CocosBuilder/ccBuilder/CocosBuilderAppDelegate.m
@@ -1295,7 +1295,7 @@ - (BOOL) openProject:(NSString*) fileName
         return NO;
     }
     project.projectPath = fileName;
-
+    [project store];
     self.projectSettings = project;
 
     [self updateResourcePathsFromProjectSettings];
@@ -2281,6 +2281,8 @@ - (IBAction)menuPublishProjectAndRunInBrowser:(id)sender
 
 - (IBAction) menuCleanCacheDirectories:(id)sender
 {
+    projectSettings.needRepublish = YES;
+    [projectSettings store];
     [CCBPublisher cleanAllCacheDirectories];
 }
 

diff --git a/CocosBuilder/ccBuilder/ProjectSettings.h b/CocosBuilder/ccBuilder/ProjectSettings.h
@@ -98,6 +98,9 @@
     BOOL deviceOrientationLandscapeLeft;
     BOOL deviceOrientationLandscapeRight;
     int resourceAutoScaleFactor;
+
+    NSString* versionStr;
+    BOOL needRepublish;
 }
 
 @property (nonatomic, copy) NSString* projectPath;
@@ -150,6 +153,8 @@
 @property (nonatomic, readonly) NSDictionary* generatedSpriteSheets;
 
 @property (nonatomic,readonly) NSDictionary* breakpoints;
+@property (nonatomic, copy) NSString* versionStr;
+@property (nonatomic, assign) BOOL needRepublish;
 
 - (id) initWithSerialization:(id)dict;
 - (BOOL) store;

diff --git a/CocosBuilder/ccBuilder/ProjectSettings.m b/CocosBuilder/ccBuilder/ProjectSettings.m
@@ -146,6 +146,8 @@ @implementation ProjectSettings
 @synthesize resourceAutoScaleFactor;
 @synthesize generatedSpriteSheets;
 @synthesize breakpoints;
+@synthesize versionStr;
+@synthesize needRepublish;
 
 - (id) init
 {
@@ -196,6 +198,8 @@ - (id) init
     }
 
     [self detectBrowserPresence];
+    self.versionStr = [self getVersion];
+    self.needRepublish = NO;
     return self;
 }
 
@@ -273,6 +277,15 @@ - (id) initWithSerialization:(id)dict
     self.javascriptMainCCB = mainCCB;
 
     [self detectBrowserPresence];
+    NSString* old = [dict objectForKey:@"versionStr"];
+    NSString* new = [self getVersion];
+    if(![new isEqual:old])
+    {
+       self.versionStr = [self getVersion];
+       self.needRepublish = YES;
+    }else{
+       self.needRepublish = NO;
+    }
     return self;
 }
 
@@ -350,6 +363,8 @@ - (id) serialize
     }
     [dict setObject:generatedSpriteSheetsDict forKey:@"generatedSpriteSheets"];
 
+    [dict setObject:versionStr forKey:@"versionStr"];
+    [dict setObject:[NSNumber numberWithBool:needRepublish] forKey:@"needRepublish"];
     return dict;
 }
 
@@ -507,4 +522,12 @@ - (void) detectBrowserPresence
         isFirefoxExist = TRUE;
     }
 }
+
+- (NSString* ) getVersion
+{
+    NSString* versionPath = [[NSBundle mainBundle] pathForResource:@"Version" ofType:@"txt" inDirectory:@"version"];
+
+    NSString* version = [NSString stringWithContentsOfFile:versionPath encoding:NSUTF8StringEncoding error:NULL];
+    return version;
+}
 @end