Merge branch 'develop' of rsa:/sdk/tools/sdk-build into develop

Conflicts:
	src/build_server/BuildServerController.rb

Change-Id: I3763d67e9b164f0cc24e0036ea133d7190d1d61b

diff --cc src/build_server/BinaryUploadProject.rb
Simple merge

diff --cc src/build_server/BuildServer.rb
Simple merge

diff --cc src/build_server/BuildServerController.rb
index 56d4637a876cc46e5af3412007534729eff56f27,0bfb648ee31866127c6aa5d872d47fc4828fe6f1..30439441f92bd4dabd7722407cc4cbea72f62abb
--- 1/src/build_server/BuildServerController.rb
--- 2/src/build_server/BuildServerController.rb
+++ b/src/build_server/BuildServerController.rb
@@@ -515,12 -491,16 +491,18 @@@ class BuildServerControlle
                        f.puts "PASSWORD=#{server.test_time}" if server.password != "0000"
                        f.puts "JOB_KEEP_TIME=#{server.keep_time}"
                        f.puts "FTP_ADDR=#{server.ftp_addr}"
 -            f.puts "FTP_PORT=#{server.ftp_port}"            
 +            f.puts "FTP_PORT=#{server.ftp_port}"
                        f.puts "FTP_USERNAME=#{server.ftp_username}"
                        f.puts "FTP_PASSWD=#{server.ftp_passwd}"
 +                      f.puts "PKG_SYNC_PERIOD=#{server.pkg_sync_period}"
 +                      f.puts "CHANGELOG_CHECK=#{server.changelog_check}"
                end
+ 
+               # save to server.db
+               if not server.db_exist? then
+                       server.create_db()
+               end
+               server.save_db()
        end
  
  
@@@ -678,15 -594,12 +602,15 @@@
                obj.ftp_username = ftp_username
                obj.ftp_passwd = ftp_passwd
  
-               # pkg synchronization
-               obj.pkg_sync_period = pkg_sync_period
+               # load from DB
+               obj.load_db()
  
 +              # change log setting
 +              obj.changelog_check = changelog_check
 +
                # save config
                write_server_config( obj )
 -              
 +
                # create object & return it
                return obj
        end

diff --cc src/build_server/GitBuildJob.rb
index 95eb3c26e976e651c995e626388ed09c2051bb81,c071f8a5e3cf7cccd9aec84415ab11f4d6c06905..0f320392f5efdb6f83473434b0fc328d565e0ef8
--- 1/src/build_server/GitBuildJob.rb
--- 2/src/build_server/GitBuildJob.rb
+++ b/src/build_server/GitBuildJob.rb
@@@ -153,26 -155,8 +155,26 @@@ class GitBuildJob < BuildJo
                        return false
                end
  
 +              #set up change log
 +              change_log = {}
 +              begin
 +              change_log = Parser.read_changelog "#{@source_path}/package/changelog" if File.exist? "#{@source_path}/package/changelog"
 +              rescue => e
 +                      @log.error( e.message, Log::LV_USER)
 +                      return false
 +              end
 +
 +              if not change_log.empty? and @pkginfo.packages[0].change_log.empty? then
 +                      @pkginfo.packages.each {|pkg| pkg.change_log = change_log}
 +              end
 +
 +              if @server.changelog_check and not @pkginfo.packages[0].does_change_exist? then
 +                      @log.error( "change log not found", Log::LV_USER )
 +                      return false
 +              end
 +
                # set up pkgsvr_client
-               @pkgsvr_client =  Client.new(@pkgserver_url, @job_working_dir, @log)
+               @pkgsvr_client =  Client.new(@pkgsvr_url, @job_working_dir, @log)
  
                # checking version if not reverse-build job or not internal-job
                if not @is_rev_build_check_job and not @is_internal_job  then

diff --cc src/build_server/RegisterPackageJob.rb
Simple merge

diff --cc src/build_server/SocketJobRequestListener.rb
Simple merge

diff --cc src/builder/Builder.rb
Simple merge