From 0eddd1a1e60ed6281453823e8285a84d57424155 Mon Sep 17 00:00:00 2001 From: donghee yang Date: Tue, 30 Oct 2012 08:28:02 +0900 Subject: [PATCH] [Title] Fixed cyclic "require" dependency --- src/build_server/BuildJob.rb | 1 - src/build_server/BuildServer.rb | 1 - src/build_server/JobClean.rb | 1 - src/build_server/MultiBuildJob.rb | 1 - src/build_server/PackageSync.rb | 1 - src/build_server/RegisterPackageJob.rb | 1 - src/build_server/ReverseBuildChecker.rb | 3 --- src/pkg_server/DistSync.rb | 1 - 8 files changed, 10 deletions(-) diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb index 08295f0..dd90a84 100644 --- a/src/build_server/BuildJob.rb +++ b/src/build_server/BuildJob.rb @@ -36,7 +36,6 @@ require "PackageManifest.rb" require "Version.rb" require "Builder.rb" require "RemoteBuilder.rb" -require "BuildServer.rb" require "JobLog.rb" require "mail.rb" require "utils.rb" diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb index 2562887..aa7d64f 100644 --- a/src/build_server/BuildServer.rb +++ b/src/build_server/BuildServer.rb @@ -31,7 +31,6 @@ require 'fileutils' require 'dbi' $LOAD_PATH.unshift File.dirname(__FILE__) require "SocketJobRequestListener.rb" -require "RemoteBuildJob.rb" require "JobManager.rb" require "JobClean.rb" require "RemoteBuildServer.rb" diff --git a/src/build_server/JobClean.rb b/src/build_server/JobClean.rb index c3dfe4f..8596839 100644 --- a/src/build_server/JobClean.rb +++ b/src/build_server/JobClean.rb @@ -30,7 +30,6 @@ require "fileutils" require "thread" $LOAD_PATH.unshift File.dirname(__FILE__) $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common" -require "BuildServer.rb" require "Action.rb" require "ScheduledActionHandler.rb" diff --git a/src/build_server/MultiBuildJob.rb b/src/build_server/MultiBuildJob.rb index 5b31daf..5385184 100644 --- a/src/build_server/MultiBuildJob.rb +++ b/src/build_server/MultiBuildJob.rb @@ -36,7 +36,6 @@ require "PackageManifest.rb" require "Version.rb" require "Builder.rb" require "RemoteBuilder.rb" -require "BuildServer.rb" require "JobLog.rb" require "mail.rb" require "CommonJob.rb" diff --git a/src/build_server/PackageSync.rb b/src/build_server/PackageSync.rb index 0aa83bc..c15ff42 100644 --- a/src/build_server/PackageSync.rb +++ b/src/build_server/PackageSync.rb @@ -30,7 +30,6 @@ require "fileutils" require "thread" $LOAD_PATH.unshift File.dirname(__FILE__) $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common" -require "BuildServer.rb" require "Action.rb" require "ScheduledActionHandler.rb" diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb index 83bb347..24e1fed 100644 --- a/src/build_server/RegisterPackageJob.rb +++ b/src/build_server/RegisterPackageJob.rb @@ -34,7 +34,6 @@ $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/plkg_server" require "client.rb" require "PackageManifest.rb" require "Version.rb" -require "BuildServer.rb" require "JobLog.rb" require "mail.rb" require "utils.rb" diff --git a/src/build_server/ReverseBuildChecker.rb b/src/build_server/ReverseBuildChecker.rb index 8222b38..ce8edc6 100644 --- a/src/build_server/ReverseBuildChecker.rb +++ b/src/build_server/ReverseBuildChecker.rb @@ -32,11 +32,8 @@ $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common" $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/pkg_server" require "utils.rb" require "client.rb" -require "BuildServer.rb" require "JobLog.rb" require "PackageManifest.rb" -require "BuildJob.rb" -require "RegisterPackageJob.rb" class ReverseBuildChecker diff --git a/src/pkg_server/DistSync.rb b/src/pkg_server/DistSync.rb index 0fa6dca..a79ea4b 100644 --- a/src/pkg_server/DistSync.rb +++ b/src/pkg_server/DistSync.rb @@ -30,7 +30,6 @@ require "fileutils" require "thread" $LOAD_PATH.unshift File.dirname(__FILE__) $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common" -require "packageServer.rb" require "Action.rb" require "ScheduledActionHandler.rb" -- 2.34.1