Browse Source

Remove unused files there were referencing ToonTown

Closes #659
Mitchell Stokes 6 years ago
parent
commit
cb7dbfc219

+ 0 - 108
dmodels/src/level_editor/donaldsDockColors.txt

@@ -1,108 +0,0 @@
-corniceColor: Vec4(0.11, 0.80, 0.22, 1.0)
-corniceColor: Vec4(0.21, 0.73, 0.31, 1.0)
-corniceColor: Vec4(0.22, 0.96, 0.27, 1.0)
-corniceColor: Vec4(0.57, 0.39, 0.34, 1.0)
-corniceColor: Vec4(0.59, 1.00, 0.92, 1.0)
-corniceColor: Vec4(0.66, 1.00, 0.86, 1.0)
-corniceColor: Vec4(0.73, 0.51, 0.51, 1.0)
-corniceColor: Vec4(0.75, 0.45, 0.45, 1.0)
-corniceColor: Vec4(0.76, 0.57, 0.29, 1.0)
-corniceColor: Vec4(0.76, 0.73, 0.64, 1.0)
-corniceColor: Vec4(0.82, 0.91, 0.44, 1.0)
-corniceColor: Vec4(0.90, 0.56, 0.34, 1.0)
-corniceColor: Vec4(0.91, 0.54, 0.44, 1.0)
-corniceColor: Vec4(0.91, 0.63, 0.44, 1.0)
-corniceColor: Vec4(0.94, 0.35, 0.35, 1.0)
-corniceColor: Vec4(0.94, 0.72, 0.66, 1.0)
-corniceColor: Vec4(1.00, 0.42, 0.27, 1.0)
-corniceColor: Vec4(1.00, 0.50, 0.38, 1.0)
-corniceColor: Vec4(1.00, 0.69, 0.49, 1.0)
-corniceColor: Vec4(1.00, 0.71, 0.27, 1.0)
-corniceColor: Vec4(1.00, 0.84, 0.59, 1.0)
-corniceColor: Vec4(1.00, 0.88, 0.80, 1.0)
-corniceColor: Vec4(1.00, 0.92, 0.59, 1.0)
-corniceColor: Vec4(1.00, 1.00, 0.59, 1.0)
-
-doorColor: Vec4(0.45, 0.53, 0.45, 1.0)
-doorColor: Vec4(0.52, 0.61, 0.52, 1.0)
-doorColor: Vec4(0.60, 0.67, 0.54, 1.0)
-doorColor: Vec4(0.63, 0.48, 0.34, 1.0)
-doorColor: Vec4(0.79, 0.47, 0.47, 1.0)
-doorColor: Vec4(0.86, 0.48, 0.23, 1.0)
-doorColor: Vec4(0.88, 0.43, 0.43, 1.0)
-doorColor: Vec4(0.91, 0.34, 0.34, 1.0)
-doorColor: Vec4(0.94, 0.70, 0.49, 1.0)
-doorColor: Vec4(0.97, 0.55, 0.40, 1.0)
-doorColor: Vec4(1.00, 0.59, 0.59, 1.0)
-
-wallColor: Vec4(0.17, 0.44, 0.28, 1.0)
-wallColor: Vec4(0.17, 0.45, 0.23, 1.0)
-wallColor: Vec4(0.36, 0.45, 0.22, 1.0)
-wallColor: Vec4(0.38, 0.31, 0.19, 1.0)
-wallColor: Vec4(0.38, 0.68, 0.46, 1.0)
-wallColor: Vec4(0.42, 0.16, 0.16, 1.0)
-wallColor: Vec4(0.42, 0.25, 0.25, 1.0)
-wallColor: Vec4(0.44, 0.67, 0.45, 1.0)
-wallColor: Vec4(0.45, 0.31, 0.17, 1.0)
-wallColor: Vec4(0.48, 0.93, 0.74, 1.0)
-wallColor: Vec4(0.52, 0.96, 0.79, 1.0)
-wallColor: Vec4(0.57, 0.70, 0.35, 1.0)
-wallColor: Vec4(0.63, 0.47, 0.24, 1.0)
-wallColor: Vec4(0.63, 0.60, 0.40, 1.0)
-wallColor: Vec4(0.64, 0.24, 0.32, 1.0)
-wallColor: Vec4(0.71, 0.49, 0.35, 1.0)
-wallColor: Vec4(0.75, 0.45, 0.45, 1.0)
-wallColor: Vec4(0.81, 0.48, 0.48, 1.0)
-wallColor: Vec4(0.87, 0.61, 0.61, 1.0)
-wallColor: Vec4(0.87, 0.69, 0.42, 1.0)
-wallColor: Vec4(0.91, 0.54, 0.54, 1.0)
-wallColor: Vec4(0.92, 0.63, 0.42, 1.0)
-wallColor: Vec4(0.93, 0.15, 0.15, 1.0)
-wallColor: Vec4(1.00, 0.00, 0.00, 1.0)
-
-windowColor: Vec4(0.00, 0.53, 0.32, 1.0)
-windowColor: Vec4(0.00, 0.61, 0.36, 1.0)
-windowColor: Vec4(0.07, 0.47, 0.31, 1.0)
-windowColor: Vec4(0.08, 0.47, 0.31, 1.0)
-windowColor: Vec4(0.17, 0.64, 0.45, 1.0)
-windowColor: Vec4(0.50, 0.38, 0.22, 1.0)
-windowColor: Vec4(0.64, 0.93, 0.45, 1.0)
-windowColor: Vec4(0.69, 0.44, 0.15, 1.0)
-windowColor: Vec4(0.73, 0.46, 0.37, 1.0)
-windowColor: Vec4(0.73, 0.63, 0.37, 1.0)
-windowColor: Vec4(0.73, 0.63, 0.45, 1.0)
-windowColor: Vec4(0.74, 0.55, 0.32, 1.0)
-windowColor: Vec4(0.78, 0.49, 0.29, 1.0)
-windowColor: Vec4(0.79, 0.47, 0.47, 1.0)
-windowColor: Vec4(0.82, 0.82, 0.40, 1.0)
-windowColor: Vec4(0.87, 0.55, 0.33, 1.0)
-windowColor: Vec4(0.87, 0.65, 0.33, 1.0)
-windowColor: Vec4(0.88, 0.43, 0.43, 1.0)
-windowColor: Vec4(0.91, 0.34, 0.45, 1.0)
-windowColor: Vec4(1.00, 0.50, 0.38, 1.0)
-windowColor: Vec4(1.00, 0.63, 0.38, 1.0)
-
-propColor: Vec4(0.17, 0.44, 0.28, 1.0)
-propColor: Vec4(0.17, 0.45, 0.23, 1.0)
-propColor: Vec4(0.36, 0.45, 0.22, 1.0)
-propColor: Vec4(0.38, 0.31, 0.19, 1.0)
-propColor: Vec4(0.38, 0.68, 0.46, 1.0)
-propColor: Vec4(0.42, 0.16, 0.16, 1.0)
-propColor: Vec4(0.42, 0.25, 0.25, 1.0)
-propColor: Vec4(0.44, 0.67, 0.45, 1.0)
-propColor: Vec4(0.45, 0.31, 0.17, 1.0)
-propColor: Vec4(0.48, 0.93, 0.74, 1.0)
-propColor: Vec4(0.52, 0.96, 0.79, 1.0)
-propColor: Vec4(0.57, 0.70, 0.35, 1.0)
-propColor: Vec4(0.63, 0.47, 0.24, 1.0)
-propColor: Vec4(0.63, 0.60, 0.40, 1.0)
-propColor: Vec4(0.64, 0.24, 0.32, 1.0)
-propColor: Vec4(0.71, 0.49, 0.35, 1.0)
-propColor: Vec4(0.75, 0.45, 0.45, 1.0)
-propColor: Vec4(0.81, 0.48, 0.48, 1.0)
-propColor: Vec4(0.87, 0.61, 0.61, 1.0)
-propColor: Vec4(0.87, 0.69, 0.42, 1.0)
-propColor: Vec4(0.91, 0.54, 0.54, 1.0)
-propColor: Vec4(0.92, 0.63, 0.42, 1.0)
-propColor: Vec4(0.93, 0.15, 0.15, 1.0)
-propColor: Vec4(1.00, 0.00, 0.00, 1.0)

+ 0 - 64
dmodels/src/level_editor/donaldsDockStyles.txt

@@ -1,64 +0,0 @@
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.417323, 0.15711, 0.15711, 1.0)
-windowTexture: window_sm_square_ur
-windowColor: Vec4(0.874016, 0.654655, 0.329041, 1.0)
-corniceTexture: cornice_marble_ur
-corniceColor: Vec4(0.76378, 0.572086, 0.287541, 1.0)
-
-wallTexture: wall_sm_wood_ur
-wallColor: Vec4(0.874016, 0.610097, 0.610097, 1.0)
-windowTexture: window_sm_shuttered_ur
-windowColor: Vec4(0.874016, 0.548402, 0.329041, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_sm_wood_ur
-wallColor: Vec4(0.913386, 0.540868, 0.540868, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.0778138, 0.472441, 0.314961, 1.0)
-corniceTexture: cornice_horizontal_ur
-corniceColor: Vec4(1.0, 0.501961, 0.376471, 1.0)
-
-wallTexture: wall_sm_wood_ur
-wallColor: Vec4(0.913386, 0.540868, 0.540868, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.0778138, 0.472441, 0.314961, 1.0)
-corniceTexture: cornice_shingles_ur
-corniceColor: Vec4(0.732283, 0.511163, 0.511163, 1.0)
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.384314, 0.305635, 0.187618, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(0.779528, 0.489115, 0.293469, 1.0)
-corniceTexture: cornice_dental_ur
-corniceColor: Vec4(0.574803, 0.38771, 0.340374, 1.0)
-
-wallTexture: wall_bricks_dr
-wallColor: Vec4(0.629921, 0.471823, 0.237147, 1.0)
-windowTexture: window_sm_shuttered_ur
-windowColor: Vec4(1.0, 0.627451, 0.376471, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_board_ur
-wallColor: Vec4(0.929134, 0.153034, 0.153034, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.0, 0.532747, 0.317894, 1.0)
-corniceTexture: cornice_shingles_ur
-corniceColor: Vec4(0.944882, 0.715146, 0.659565, 1.0)
-
-wallTexture: wall_lg_brick_ur
-wallColor: Vec4(0.166003, 0.440945, 0.276671, 1.0)
-windowTexture: window_md_curtains_ur
-windowColor: Vec4(0.17258, 0.637795, 0.450208, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_board_ur
-wallColor: Vec4(0.929134, 0.153034, 0.153034, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.0, 0.532747, 0.317894, 1.0)
-corniceTexture: None
-corniceColor: None
-
-

BIN
dmodels/src/level_editor/donalds_dock_layout.flt


+ 0 - 61
dmodels/src/level_editor/minniesMelodyLandColors.txt

@@ -1,61 +0,0 @@
-corniceColor: Vec4(0.43, 0.32, 0.85, 1.0)
-corniceColor: Vec4(0.67, 0.40, 0.99, 1.0)
-corniceColor: Vec4(0.68, 0.22, 0.80, 1.0)
-corniceColor: Vec4(0.80, 0.22, 0.68, 1.0)
-corniceColor: Vec4(0.81, 0.30, 0.51, 1.0)
-corniceColor: Vec4(1.00, 1.00, 0.58, 1.0)
-
-doorColor: Vec4(0.42, 0.42, 0.85, 1.0)
-doorColor: Vec4(0.45, 0.22, 0.60, 1.0)
-doorColor: Vec4(0.49, 0.79, 1.00, 1.0)
-doorColor: Vec4(0.56, 0.80, 0.65, 1.0)
-doorColor: Vec4(0.59, 0.49, 1.00, 1.0)
-doorColor: Vec4(0.64, 0.45, 0.92, 1.0)
-doorColor: Vec4(0.65, 0.40, 0.82, 1.0)
-doorColor: Vec4(0.69, 0.33, 0.69, 1.0)
-doorColor: Vec4(0.80, 0.56, 0.65, 1.0)
-doorColor: Vec4(0.87, 0.80, 0.47, 1.0)
-doorColor: Vec4(0.97, 0.87, 0.47, 1.0)
-doorColor: Vec4(1.00, 0.42, 0.85, 1.0)
-doorColor: Vec4(1.00, 0.79, 0.49, 1.0)
-
-wallColor: Vec4(0.49, 0.69, 1.00, 1.0)
-wallColor: Vec4(0.59, 0.75, 1.00, 1.0)
-wallColor: Vec4(0.70, 0.76, 1.00, 1.0)
-wallColor: Vec4(0.80, 0.47, 0.80, 1.0)
-wallColor: Vec4(0.80, 0.80, 0.47, 1.0)
-wallColor: Vec4(0.91, 0.91, 0.54, 1.0)
-wallColor: Vec4(0.96, 0.96, 0.47, 1.0)
-wallColor: Vec4(0.96, 0.96, 0.73, 1.0)
-wallColor: Vec4(0.97, 0.36, 0.36, 1.0)
-wallColor: Vec4(0.97, 0.47, 0.67, 1.0)
-wallColor: Vec4(1.00, 0.70, 0.70, 1.0)
-wallColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-windowColor: Vec4(0.42, 0.42, 0.85, 1.0)
-windowColor: Vec4(0.45, 0.22, 0.60, 1.0)
-windowColor: Vec4(0.49, 0.79, 1.00, 1.0)
-windowColor: Vec4(0.56, 0.80, 0.65, 1.0)
-windowColor: Vec4(0.59, 0.49, 1.00, 1.0)
-windowColor: Vec4(0.64, 0.45, 0.92, 1.0)
-windowColor: Vec4(0.65, 0.40, 0.82, 1.0)
-windowColor: Vec4(0.69, 0.33, 0.69, 1.0)
-windowColor: Vec4(0.80, 0.45, 0.71, 1.0)
-windowColor: Vec4(0.80, 0.56, 0.65, 1.0)
-windowColor: Vec4(0.97, 0.87, 0.47, 1.0)
-windowColor: Vec4(1.00, 0.79, 0.49, 1.0)
-
-propColor: Vec4(0.49, 0.69, 1.00, 1.0)
-propColor: Vec4(0.59, 0.75, 1.00, 1.0)
-propColor: Vec4(0.70, 0.76, 1.00, 1.0)
-propColor: Vec4(0.80, 0.47, 0.80, 1.0)
-propColor: Vec4(0.80, 0.80, 0.47, 1.0)
-propColor: Vec4(0.91, 0.91, 0.54, 1.0)
-propColor: Vec4(0.96, 0.96, 0.47, 1.0)
-propColor: Vec4(0.96, 0.96, 0.73, 1.0)
-propColor: Vec4(0.97, 0.36, 0.36, 1.0)
-propColor: Vec4(0.97, 0.47, 0.67, 1.0)
-propColor: Vec4(1.00, 0.70, 0.70, 1.0)
-propColor: Vec4(1.00, 1.00, 1.00, 1.0)
-propColor: Vec4(0.92, 0.92, 0.92, 1.0)
-wallColor: Vec4(0.97, 0.58, 0.55, 1.0)

+ 0 - 79
dmodels/src/level_editor/minniesMelodyLandStyles.txt

@@ -1,79 +0,0 @@
-wallTexture: wall_md_bricks_ur
-wallColor: Vec4(0.59, 0.75, 1.00, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(0.45, 0.22, 0.60, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.91, 0.91, 0.54, 1.0)
-windowTexture: window_sm_square_ur
-windowColor: Vec4(0.65, 0.40, 0.82, 1.0)
-corniceTexture: cornice_curved_ur
-corniceColor: Vec4(0.68, 0.22, 0.80, 1.0)
-
-wallTexture: wall_sm_brick_pink_ur
-wallColor: Vec4(1.00, 1.00, 1.00, 1.0)
-windowTexture: window_sm_curved_ur
-windowColor: Vec4(0.49, 0.79, 1.00, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_lg_rock_ur
-wallColor: Vec4(0.80, 0.47, 0.80, 1.0)
-windowTexture: window_sm_square_ur
-windowColor: Vec4(0.80, 0.56, 0.65, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_lg_rock_ur
-wallColor: Vec4(0.80, 0.80, 0.47, 1.0)
-windowTexture: window_sm_square_ur
-windowColor: Vec4(0.56, 0.80, 0.65, 1.0)
-corniceTexture: cornice_marble_ur
-corniceColor: Vec4(0.80, 0.22, 0.68, 1.0)
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.49, 0.69, 1.00, 1.0)
-windowTexture: window_sm_curved_ur
-windowColor: Vec4(0.59, 0.49, 1.00, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_bricks_ur
-wallColor: Vec4(1.00, 0.70, 0.70, 1.0)
-windowTexture: window_md_curved_ur
-windowColor: Vec4(1.00, 0.79, 0.49, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.96, 0.96, 0.47, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(0.69, 0.33, 0.69, 1.0)
-corniceTexture: cornice_brick_ur
-corniceColor: Vec4(0.81, 0.30, 0.51, 1.0)
-
-wallTexture: wall_md_bricks_ur
-wallColor: Vec4(0.70, 0.76, 1.00, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.42, 0.42, 0.85, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_lg_brick_ur
-wallColor: Vec4(0.97, 0.47, 0.67, 1.0)
-windowTexture: window_md_curtains_ur
-windowColor: Vec4(0.64, 0.45, 0.92, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.97, 0.36, 0.36, 1.0)
-windowTexture: window_sm_curved_ur
-windowColor: Vec4(0.97, 0.87, 0.47, 1.0)
-corniceTexture: cornice_curved_ur
-corniceColor: Vec4(0.43, 0.32, 0.85, 1.0)
-
-
-

BIN
dmodels/src/level_editor/minnies_melody_land_layout.flt


+ 0 - 65
dmodels/src/level_editor/theBurrrghColors.txt

@@ -1,65 +0,0 @@
-corniceColor: Vec4(0.00, 0.34, 0.58, 1.0)
-corniceColor: Vec4(0.34, 0.90, 0.87, 1.0)
-corniceColor: Vec4(0.41, 0.58, 0.85, 1.0)
-corniceColor: Vec4(0.42, 0.98, 0.74, 1.0)
-corniceColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-doorColor: Vec4(0.00, 0.87, 0.69, 1.0)
-doorColor: Vec4(0.22, 0.83, 0.83, 1.0)
-doorColor: Vec4(0.23, 0.71, 0.84, 1.0)
-doorColor: Vec4(0.23, 0.85, 0.60, 1.0)
-doorColor: Vec4(0.24, 0.76, 0.89, 1.0)
-doorColor: Vec4(0.27, 1.00, 0.85, 1.0)
-doorColor: Vec4(0.38, 0.63, 1.00, 1.0)
-doorColor: Vec4(0.49, 0.69, 1.00, 1.0)
-doorColor: Vec4(0.49, 0.89, 1.00, 1.0)
-doorColor: Vec4(0.50, 0.64, 0.85, 1.0)
-doorColor: Vec4(0.59, 1.00, 0.92, 1.0)
-doorColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-wallColor: Vec4(0.00, 0.87, 0.69, 1.0)
-wallColor: Vec4(0.22, 0.83, 0.83, 1.0)
-wallColor: Vec4(0.23, 0.85, 0.60, 1.0)
-wallColor: Vec4(0.24, 0.76, 0.89, 1.0)
-wallColor: Vec4(0.25, 0.64, 0.91, 1.0)
-wallColor: Vec4(0.27, 1.00, 0.85, 1.0)
-wallColor: Vec4(0.38, 0.63, 1.00, 1.0)
-wallColor: Vec4(0.49, 0.69, 1.00, 1.0)
-wallColor: Vec4(0.49, 0.89, 1.00, 1.0)
-wallColor: Vec4(0.50, 0.64, 0.85, 1.0)
-wallColor: Vec4(0.59, 1.00, 0.92, 1.0)
-wallColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-windowColor: Vec4(0.00, 0.69, 0.69, 1.0)
-windowColor: Vec4(0.00, 0.87, 0.69, 1.0)
-windowColor: Vec4(0.14, 0.42, 0.85, 1.0)
-windowColor: Vec4(0.16, 0.67, 1.00, 1.0)
-windowColor: Vec4(0.20, 0.53, 0.46, 1.0)
-windowColor: Vec4(0.22, 0.83, 0.83, 1.0)
-windowColor: Vec4(0.23, 0.71, 0.84, 1.0)
-windowColor: Vec4(0.23, 0.85, 0.60, 1.0)
-windowColor: Vec4(0.24, 0.76, 0.89, 1.0)
-windowColor: Vec4(0.27, 1.00, 0.85, 1.0)
-windowColor: Vec4(0.38, 0.63, 1.00, 1.0)
-windowColor: Vec4(0.38, 0.87, 1.00, 1.0)
-windowColor: Vec4(0.49, 0.69, 1.00, 1.0)
-windowColor: Vec4(0.49, 0.89, 1.00, 1.0)
-windowColor: Vec4(0.49, 1.00, 1.00, 1.0)
-windowColor: Vec4(0.50, 0.64, 0.85, 1.0)
-windowColor: Vec4(0.59, 0.85, 0.69, 1.0)
-windowColor: Vec4(0.59, 0.92, 0.61, 1.0)
-windowColor: Vec4(0.59, 1.00, 0.92, 1.0)
-windowColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-propColor: Vec4(0.00, 0.87, 0.69, 1.0)
-propColor: Vec4(0.22, 0.83, 0.83, 1.0)
-propColor: Vec4(0.23, 0.85, 0.60, 1.0)
-propColor: Vec4(0.24, 0.76, 0.89, 1.0)
-propColor: Vec4(0.25, 0.64, 0.91, 1.0)
-propColor: Vec4(0.27, 1.00, 0.85, 1.0)
-propColor: Vec4(0.38, 0.63, 1.00, 1.0)
-propColor: Vec4(0.49, 0.69, 1.00, 1.0)
-propColor: Vec4(0.49, 0.89, 1.00, 1.0)
-propColor: Vec4(0.50, 0.64, 0.85, 1.0)
-propColor: Vec4(0.59, 1.00, 0.92, 1.0)
-propColor: Vec4(1.00, 1.00, 1.00, 1.0)

+ 0 - 90
dmodels/src/level_editor/theBurrrghStyles.txt

@@ -1,90 +0,0 @@
-wallTexture: wall_lg_brick_ur
-wallColor: Vec4(0.25, 0.64, 0.91, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(0.23, 0.71, 0.84, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.00, 0.87, 0.69, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(0.23, 0.71, 0.84, 1.0)
-corniceTexture: cornice_curved_ur
-corniceColor: Vec4(0.00, 0.34, 0.58, 1.0)
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.49, 0.69, 1.00, 1.0)
-windowTexture: window_sm_curved_ur
-windowColor: Vec4(0.20, 0.53, 0.46, 1.0)
-corniceTexture: cornice_ice_ur
-corniceColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-wallTexture: wall_sm_brick_blue_ur
-wallColor: Vec4(1.00, 1.00, 1.00, 1.0)
-windowTexture: window_sm_square_ur
-windowColor: Vec4(0.49, 1.00, 1.00, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.27, 1.00, 0.85, 1.0)
-windowTexture: window_sm_square_ur
-windowColor: Vec4(0.49, 1.00, 1.00, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.49, 0.89, 1.00, 1.0)
-windowTexture: window_sm_pointed_ur
-windowColor: Vec4(0.00, 0.69, 0.69, 1.0)
-corniceTexture: cornice_ice_ur
-corniceColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-wallTexture: wall_md_bricks_ur
-wallColor: Vec4(0.50, 0.64, 0.85, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.14, 0.42, 0.85, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.38, 0.63, 1.00, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.14, 0.42, 0.85, 1.0)
-corniceTexture: cornice_dental_ur
-corniceColor: Vec4(0.41, 0.58, 0.85, 1.0)
-
-wallTexture: wall_bricks_ur
-wallColor: Vec4(0.23, 0.85, 0.60, 1.0)
-windowTexture: window_sm_square_ur
-windowColor: Vec4(0.59, 0.85, 0.69, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_bricks_ur
-wallColor: Vec4(0.59, 1.00, 0.92, 1.0)
-windowTexture: window_md_curved_ur
-windowColor: Vec4(0.16, 0.67, 1.00, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(0.22, 0.83, 0.83, 1.0)
-windowTexture: window_sm_curved_ur
-windowColor: Vec4(0.38, 0.87, 1.00, 1.0)
-corniceTexture: cornice_ice_ur
-corniceColor: Vec4(1.00, 1.00, 1.00, 1.0)
-
-wallTexture: wall_sm_cement_blue_ur
-wallColor: Vec4(1.00, 1.00, 1.00, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(0.59, 0.92, 0.61, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_bricks_ur
-wallColor: Vec4(0.24, 0.76, 0.89, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(0.59, 0.92, 0.61, 1.0)
-corniceTexture: None
-corniceColor: None

BIN
dmodels/src/level_editor/the_burrrgh_layout.flt


+ 0 - 106
dmodels/src/level_editor/toontownCentralColors.txt

@@ -1,106 +0,0 @@
-corniceColor: Vec4(0.11, 0.80, 0.22, 1.0)
-corniceColor: Vec4(0.21, 0.73, 0.31, 1.0)
-corniceColor: Vec4(0.22, 0.96, 0.27, 1.0)
-corniceColor: Vec4(0.27, 0.77, 0.42, 1.0)
-corniceColor: Vec4(0.32, 0.54, 0.36, 1.0)
-corniceColor: Vec4(0.44, 0.91, 0.63, 1.0)
-corniceColor: Vec4(0.76, 0.73, 0.64, 1.0)
-corniceColor: Vec4(0.79, 0.36, 0.19, 1.0)
-corniceColor: Vec4(0.82, 0.91, 0.44, 1.0)
-corniceColor: Vec4(0.90, 0.56, 0.34, 1.0)
-corniceColor: Vec4(0.91, 0.54, 0.44, 1.0)
-corniceColor: Vec4(0.91, 0.63, 0.44, 1.0)
-corniceColor: Vec4(0.94, 0.35, 0.35, 1.0)
-corniceColor: Vec4(0.94, 0.71, 0.66, 1.0)
-corniceColor: Vec4(0.98, 0.58, 0.42, 1.0)
-corniceColor: Vec4(1.00, 0.42, 0.27, 1.0)
-corniceColor: Vec4(1.00, 0.56, 0.21, 1.0)
-corniceColor: Vec4(1.00, 0.69, 0.49, 1.0)
-corniceColor: Vec4(1.00, 0.71, 0.27, 1.0)
-corniceColor: Vec4(1.00, 0.75, 0.38, 1.0)
-corniceColor: Vec4(1.00, 0.84, 0.59, 1.0)
-corniceColor: Vec4(1.00, 0.88, 0.80, 1.0)
-corniceColor: Vec4(1.00, 0.92, 0.59, 1.0)
-corniceColor: Vec4(1.00, 1.00, 0.59, 1.0)
-
-doorColor: Vec4(0.75, 0.79, 0.55, 1.0)
-doorColor: Vec4(0.81, 0.61, 0.48, 1.0)
-doorColor: Vec4(1.00, 0.59, 0.59, 1.0)
-doorColor: Vec4(1.00, 0.63, 0.38, 1.0)
-doorColor: Vec4(1.00, 0.87, 0.38, 1.0)
-doorColor: Vec4(1.00, 0.88, 0.56, 1.0)
-doorColor: Vec4(1.00, 0.88, 0.56, 1.0)
-
-wallColor: Vec4(0.11, 0.80, 0.22, 1.0)
-wallColor: Vec4(0.21, 0.73, 0.31, 1.0)
-wallColor: Vec4(0.22, 0.96, 0.27, 1.0)
-wallColor: Vec4(0.24, 0.79, 0.32, 1.0)
-wallColor: Vec4(0.25, 0.65, 0.29, 1.0)
-wallColor: Vec4(0.49, 0.96, 0.42, 1.0)
-wallColor: Vec4(0.76, 0.73, 0.64, 1.0)
-wallColor: Vec4(0.82, 0.91, 0.44, 1.0)
-wallColor: Vec4(0.90, 0.56, 0.34, 1.0)
-wallColor: Vec4(0.91, 0.54, 0.44, 1.0)
-wallColor: Vec4(0.91, 0.63, 0.44, 1.0)
-wallColor: Vec4(0.94, 0.35, 0.35, 1.0)
-wallColor: Vec4(0.95, 0.89, 0.17, 1.0)
-wallColor: Vec4(0.99, 0.67, 0.25, 1.0)
-wallColor: Vec4(0.99, 0.69, 0.49, 1.0)
-wallColor: Vec4(0.99, 0.89, 0.49, 1.0)
-wallColor: Vec4(1.00, 0.42, 0.27, 1.0)
-wallColor: Vec4(1.00, 0.67, 0.59, 1.0)
-wallColor: Vec4(1.00, 0.69, 0.49, 1.0)
-wallColor: Vec4(1.00, 0.71, 0.27, 1.0)
-wallColor: Vec4(1.00, 0.84, 0.59, 1.0)
-wallColor: Vec4(1.00, 0.88, 0.80, 1.0)
-wallColor: Vec4(1.00, 0.90, 0.33, 1.0)
-wallColor: Vec4(1.00, 0.92, 0.59, 1.0)
-wallColor: Vec4(1.00, 1.00, 0.59, 1.0)
-
-windowColor: Vec4(0.10, 0.59, 0.39, 1.0)
-windowColor: Vec4(0.11, 0.67, 0.33, 1.0)
-windowColor: Vec4(0.13, 0.78, 0.52, 1.0)
-windowColor: Vec4(0.14, 0.53, 0.30, 1.0)
-windowColor: Vec4(0.27, 1.00, 0.42, 1.0)
-windowColor: Vec4(0.31, 0.63, 0.37, 1.0)
-windowColor: Vec4(0.32, 0.54, 0.36, 1.0)
-windowColor: Vec4(0.32, 0.67, 0.60, 1.0)
-windowColor: Vec4(0.40, 0.61, 0.67, 1.0)
-windowColor: Vec4(0.59, 1.00, 0.49, 1.0)
-windowColor: Vec4(0.88, 0.44, 0.15, 1.0)
-windowColor: Vec4(0.91, 0.63, 0.44, 1.0)
-windowColor: Vec4(0.95, 0.89, 0.17, 1.0)
-windowColor: Vec4(0.99, 0.99, 0.49, 1.0)
-windowColor: Vec4(1.00, 0.27, 0.27, 1.0)
-windowColor: Vec4(1.00, 0.50, 0.38, 1.0)
-windowColor: Vec4(1.00, 0.59, 0.59, 1.0)
-windowColor: Vec4(1.00, 0.63, 0.30, 1.0)
-windowColor: Vec4(1.00, 0.63, 0.38, 1.0)
-windowColor: Vec4(1.00, 0.87, 0.38, 1.0)
-windowColor: Vec4(1.00, 0.92, 0.59, 1.0)
-
-propColor: Vec4(0.11, 0.80, 0.22, 1.0)
-propColor: Vec4(0.21, 0.73, 0.31, 1.0)
-propColor: Vec4(0.22, 0.96, 0.27, 1.0)
-propColor: Vec4(0.24, 0.79, 0.32, 1.0)
-propColor: Vec4(0.25, 0.65, 0.29, 1.0)
-propColor: Vec4(0.49, 0.96, 0.42, 1.0)
-propColor: Vec4(0.76, 0.73, 0.64, 1.0)
-propColor: Vec4(0.82, 0.91, 0.44, 1.0)
-propColor: Vec4(0.90, 0.56, 0.34, 1.0)
-propColor: Vec4(0.91, 0.54, 0.44, 1.0)
-propColor: Vec4(0.91, 0.63, 0.44, 1.0)
-propColor: Vec4(0.94, 0.35, 0.35, 1.0)
-propColor: Vec4(0.95, 0.89, 0.17, 1.0)
-propColor: Vec4(0.99, 0.67, 0.25, 1.0)
-propColor: Vec4(0.99, 0.69, 0.49, 1.0)
-propColor: Vec4(0.99, 0.89, 0.49, 1.0)
-propColor: Vec4(1.00, 0.42, 0.27, 1.0)
-propColor: Vec4(1.00, 0.67, 0.59, 1.0)
-propColor: Vec4(1.00, 0.69, 0.49, 1.0)
-propColor: Vec4(1.00, 0.71, 0.27, 1.0)
-propColor: Vec4(1.00, 0.84, 0.59, 1.0)
-propColor: Vec4(1.00, 0.88, 0.80, 1.0)
-propColor: Vec4(1.00, 0.90, 0.33, 1.0)
-propColor: Vec4(1.00, 0.92, 0.59, 1.0)
-propColor: Vec4(1.00, 1.00, 0.59, 1.0)

+ 0 - 84
dmodels/src/level_editor/toontownCentralStyles.txt

@@ -1,84 +0,0 @@
-wallTexture: wall_md_pillars_ur
-wallColor: Vec4(1.0, 0.917, 0.592, 1.0)
-windowTexture: window_sm_pointed_ur
-windowColor: Vec4(0.396,  0.611,  0.666,  1.0)
-corniceTexture: cornice_stone_ur
-corniceColor: Vec4(1.0, 1.0, 0.592,  1.0)
-
-wallTexture: wall_md_pillars_ur
-wallColor: Vec4(1.0, 1.0, 0.592157, 1.0)
-windowTexture: window_sm_pointed_ur
-windowColor: Vec4(0.142751, 0.527559, 0.295847, 1.0)
-corniceTexture: cornice_stone_ur
-corniceColor: Vec4(1.0, 1.0, 0.592157, 1.0)
-        
-wallTexture: wall_lg_brick_ur
-wallColor: Vec4(1.0, 0.415686, 0.270588, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.306315, 0.627451, 0.370542, 1.0)
-corniceTexture: None
-corniceColor: None
-        
-wallTexture: wall_sm_cement_ur
-wallColor: Vec4(1.0, 0.882353, 0.803922, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.0972673, 0.590551, 0.393701, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_dental_ur
-wallColor: Vec4(0.996078, 0.894118, 0.486275, 1.0)
-windowTexture: window_md_curved_ur
-windowColor: Vec4(1.0, 0.87451, 0.376471, 1.0)
-corniceTexture: None
-corniceColor: None
-        
-wallTexture: wall_md_pillars_ur
-wallColor: Vec4(0.996078, 0.690196, 0.486275, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.31706, 0.535433, 0.361155, 1.0)
-corniceTexture: None
-corniceColor: None
-        
-wallTexture: wall_md_pillars_ur
-wallColor: Vec4(0.996078, 0.690196, 0.486275, 1.0)
-windowTexture: window_porthole_ur
-windowColor: Vec4(0.31706, 0.535433, 0.361155, 1.0)
-corniceTexture: cornice_brick_ur
-corniceColor: Vec4(0.31706, 0.535433, 0.361155, 1.0)
-
-wallTexture: wall_lg_brick_ur
-wallColor: Vec4(0.996078, 0.690196, 0.486275, 1.0)
-windowTexture: window_sm_curved_ur
-windowColor: Vec4(0.996078, 0.996078, 0.486275, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(1.0, 0.415686, 0.270588, 1.0)
-windowTexture: window_sm_curved_ur
-windowColor: Vec4(1.0, 0.87451, 0.376471, 1.0)
-corniceTexture: cornice_marble_ur
-corniceColor: Vec4(1.0, 0.74902, 0.376471, 1.0)
-
-wallTexture: wall_sm_brick_ur
-wallColor: Vec4(1.0, 0.67451, 0.592157, 1.0)
-windowTexture: window_sm_pointed_ur
-windowColor: Vec4(0.88189, 0.439216, 0.145252, 1.0)
-corniceTexture: None
-corniceColor: None
-
-wallTexture: wall_md_blank_ur
-wallColor: Vec4(1.0, 0.705882, 0.270588, 1.0)
-windowTexture: window_sm_pointed_ur
-windowColor: Vec4(0.110236, 0.669291, 0.333333, 1.0)
-corniceTexture: cornice_stone_ur
-corniceColor: Vec4(0.944882, 0.711441, 0.559518, 1.0)
-
-wallTexture: wall_md_dental_ur
-wallColor: Vec4(0.909804, 0.630415, 0.444156, 1.0)
-windowTexture: window_sm_round_ur
-windowColor: Vec4(1.0, 0.270588, 0.270588, 1.0)
-corniceTexture: None
-corniceColor: None
-

BIN
dmodels/src/level_editor/toontown_central_layout.flt


+ 0 - 47
dtool/src/dtoolbase/dllbase.txt

@@ -1,47 +0,0 @@
-; This file is used by the MSVC linker to specify DLL base addresses to
-; prevent runtime relocation of DLLs by the windows loader.  This speeds
-; loading.  This file was generated using $PANDATOOL/src/scripts/basedlls.pl
-; which uses rebase.exe from the MS platform SDK.  It may additionally be
-; hand-hacked to simplify addresses for popular dlls to aid debugging.
-
-; release dlls
-
-libpanda         0x0000000060000000 0x004c0000
-libwindisplay    0x00000000604c0000 0x00010000
-libpandadx8      0x0000000061000000 0x00090000
-libpandadx7      0x0000000061000000 0x00040000
-libpandagl       0x0000000061000000 0x00030000
-libpandaexpress  0x00000000605d0000 0x00150000
-libpandaphysics  0x0000000060720000 0x00060000
-libpandafx       0x0000000060780000 0x00020000
-libdtool         0x00000000607a0000 0x00020000
-libdtoolconfig   0x00000000607c0000 0x00040000
-libpystub        0x0000000060800000 0x00010000
-libdirect        0x0000000060810000 0x00050000
-libtoontown      0x0000000060860000 0x000b0000
-; TODO put in a base for Pirates Opt 4 DLL
-libpirates       0x0000000060860000 0x000b0000
-libmiles_audio   0x0000000060910000 0x00020000
-libpandaegg      0x0000000060930000 0x00130000
-libframework     0x0000000060a60000 0x00020000
-
-; debug dlls
-
-libpanda_d       0x0000000060000000 0x007e0000
-libwindisplay_d  0x00000000607e0000 0x00020000
-libpandadx8_d    0x0000000060800000 0x000d0000
-libpandadx7_d    0x00000000608d0000 0x00060000
-libpandagl_d     0x0000000060930000 0x00040000
-libpandaexpress_d 0x0000000060970000 0x00220000
-libpandaphysics_d 0x0000000060b90000 0x000a0000
-libpandafx_d     0x0000000060c30000 0x00030000
-libdtool_d       0x0000000060c60000 0x00030000
-libdtoolconfig_d 0x0000000060c90000 0x00070000
-libpystub_d      0x0000000060d00000 0x00010000
-libdirect_d      0x0000000060d10000 0x00080000
-libtoontown_d    0x0000000060d90000 0x00130000
-; TODO put in a base for Pirates
-libpirates_d    0x0000000060d90000 0x00130000
-libmiles_audio_d 0x0000000060ec0000 0x00030000
-libpandaegg_d    0x0000000060ef0000 0x00210000
-libframework_d   0x0000000061100000 0x00030000

+ 0 - 122
pandatool/src/scripts/.cshrc

@@ -1,122 +0,0 @@
-set prompt='%m:%B%~%b> '
-alias ls 'ls -C -F'
-alias dir ls -C -F -l
-alias vi vim
-alias fd ftp dumbo
-alias tz tar zxvf
-alias so1 setenv PANDA_OPTIMIZE 1
-alias so3 setenv PANDA_OPTIMIZE 3
-alias cpd  'cd $PANDA/src'
-alias emacs xemacs
-alias em xemacs
-alias mi make install
-alias ni nmake install
-alias dh demo /install/models/herc-6000.egg /install/models/HB_1_HE1.egg
-set nobeep=1
-
-# my defaults for panda build
-if (! $?PANDA_OPTIMIZE ) then
-setenv PANDA_OPTIMIZE 1
-endif
-
-setenv CL_MAKE_BROWSE_INFO 0
-alias setbrowseinfo1 setenv CL_MAKE_BROWSE_INFO 1
-alias setbrowseinfo0 setenv CL_MAKE_BROWSE_INFO 0
-
-setenv HAVE_GL yes
-setenv HAVE_DX yes
-setenv USE_NSPR t
-
-if (! $?USER ) then
-setenv USER georges
-endif
-
-if (! $?CYGWIN_ROOT) then
-# may cause tcsh hang
-setenv CYGWIN_ROOT `cygpath -w /`
-endif
-
-setenv PENV_COMPILER WIN32_VC
-setenv PENV WIN32
-setenv PANDA_ROOT C:/Cygwin
-
-setenv CVSROOT :pserver:georges@dimbo:/fit/cvs
-#setenv CVS_PASSFILE ~/.cvspass
-
-# check out files read-only
-setenv CVSREAD 1
-
-if (! $?PPREMAKE_CONFIG) then
-setenv PPREMAKE_CONFIG /usr/local/etc/Config.pp
-endif
-
-# /usr/local/panda/bin for ppremake
-if(! $?TCSH_NO_CHANGEPATH) then
-set path=(/bin /contrib/bin $path ~/scripts $path /usr/local/panda/bin)
-endif
-
-
-if (! $?TCSH_NO_PANDA_ATTACH ) then
-# setenv TOOL /install/tool
-setenv MYTOOL ~/player/dtool
-setenv MYTOOL_CSHRC $MYTOOL/etc/dtool.cshrc
-#echo "   checking for dtool.cshrc"
-
-if(-e $MYTOOL_CSHRC) then
-setenv DTOOL $MYTOOL
-#setenv CTATTACH_DEBUG 1
-#echo "  found my dtool.cshrc"
-source $DTOOL/etc/dtool.cshrc personal
-
-# else
-# echo "WARNING: $TOOL_CSHRC doesnt exist, panda env setup failed!"
-# cd /install
-else
-
-setenv DTOOL /g/player/install/win2k/dtool
-source $DTOOL/etc/dtool.cshrc install
-endif
-
-cta panda personal
-
-if(! $?TCSH_NO_CSHRC_CHDIR ) then
-cd $PANDA
-endif
-
-endif
-
-# this version of emacs ignores cygwin root, cant give it cygwin paths
-#set path=(/cygdrive/c/progra~1/XEmacs/XEmacs-21.1.9/i386-pc-win32 /bin /contrib/bin $path)
-#set path=( /bin /contrib/bin /cygdrive/c/python16 $path )
-#set path=( /bin /contrib/bin $path ~/scripts /usr/sbin /contrib/sbin)  for new cygwin
-
-#set path=($path /cygdrive/c/progra~1/micros~1/common/msdev98/bin /cygdrive/c/progra~1/micros~1/common/tools/winnt /cygdrive/c/progra~1/micros~1/common/tools /cygdrive/c/progra~1/micros~1/vc98/bin /cygdrive/c/winnt /cygdrive/c/winnt/system32 /cygdrive/c/bin)
-#set lib = (/cygdrive/c/progra~1/micros~1/vc98/lib /cygdrive/c/progra~1/micros~1/vc98/mfc/lib)
-# note:  have to set vc envvars in sys env vars
-#cd $HOME
-unset owd
-
-alias mktool 'cd $DTOOL/src/build;./initialize make;cd $DTOOL;make install'
-#alias cpdll 'cp -p $PANDA/src/all/pandadx/*dll $PANDA/src/all/panda/*dll $PANDA/src/all/pandaegg/*dll $PANDA/lib;cp -p $PANDA/src/all/pandadx/lib*pdb $PANDA/src/all/panda/lib*pdb $PANDA/src/all/pandaegg/lib*pdb $PANDA/lib'
-alias mkdx  'cd dxgsg; make install; cd ../wdxdisplay; make install; cd ../../metalibs/pandadx; make install; cd wdxdisplay'
-alias mkgl  'cd glgsg; make install; cd ../wgldisplay; make install; cd ../../metalibs/pandagl; make install; cd wgldisplay'
-alias cpdxbak 'chmod a+w $PANDA/dx-bak/*;cp $PANDA/src/dxgsg/*.? $PANDA/src/wdxdisplay/*.? $PANDA/dx-bak'
-alias tlinit 'cd $DTOOL/src/build; ./initialize make; cd $DTOOL'
-alias setctdbg 'setenv CTATTACH_DEBUG 1'
-alias update cvs update
-alias cvhist cvs history -a
-alias log cvs log
-alias updn 'cvs -n update -R -d \!* |& egrep -v "Updating|^\?"'
-alias cvdiff cvs diff
-alias cvlog ~/scripts/cvs2cl.pl
-alias updr 'cvs update -R -d \!* |& egrep -v "Updating|^\?"'
-alias upd  'cvs update -d \!* |& egrep -v "Updating|^\?"'
-alias lastchng ~/scripts/lastchng.pl
-alias wnewdiff 'cvs update -p -r HEAD  \!* > junk; windiff junk \!* &'
-#only works if cur ver differs from checked in version
-#alias newdiff 'cvs diff -r`log -h \!* | grep head | sed -e "s/head: //"` \!*'
-# turns out all you need is this
-alias newdiff 'cvs diff -r HEAD -w \!*'
-# need version that picks out last 2 revs and does the diff
-alias cvsclean "find \!* -path '*CVS*' -prune -or -not -name 'bldlog*' -and -not -type d -print | xargs --no-run-if-empty -n 40 rm"
-

+ 0 - 111
pandatool/src/scripts/basedlls.pl

@@ -1,111 +0,0 @@
-#!perl
-
-# generate address base file for panda dlls
-# to simplify things, do it for Opt1 and reuse that for Opt2, 
-# and do it for Opt3 and use that for Opt4, since they will both be bigger than counterparts
-# to run, in any directory, do 'perl basedlls.pl' and it will generate dllbase.txt and dllbase_d.txt in 'tmp' dir under current
-# make sure Opt1 and Opt3 are current so current sizes are used in map
-
-$archive_root="\\\\dimbo\\panda\\win\\";
-#edit this to where rebase.exe is on your machine, must be cygwin-style path for cygwin perl
-$rebase_path="/msvc7/Common7/Tools/bin";
-$ENV{'PATH'}=$rebase_path.":".$ENV{'PATH'};
-
-# note: this is the order dlls will be laid out in memory
-@dll_names=("libpanda","libwindisplay","libpandadx8","libpandadx7","libpandagl","libpandaexpress","libpandaphysics","libpandafx","libdtool","libdtoolconfig","libpystub","libdirect","libtoontown","libmiles_audio","libpandaegg","libframework");
-
-# old audio dlls
-#            "libaudio_load_midi","libaudio_load_mp3","libaudio_load_st","libaudio_load_wav",
-
-@headerstrs=(
-"This file is used by the MSVC linker to specify DLL base addresses to",
-"prevent runtime relocation of DLLs by the windows loader.  This speeds",
-"loading.  This file was generated using \$PANDATOOL/src/scripts/basedlls.pl",
-"which uses rebase.exe from the MS platform SDK.  It may additionally be",
-"hand-hacked to simplify addresses for popular dlls to aid debugging.",
-);
-
-$headerstr="";
-for($i=0;$i<=$#headerstrs;$i++) {
-   $headerstr.="; ".$headerstrs[$i]."\n";
-}
-
-@modules=("dtool","panda","direct","toontown");
-
-$dll_names_nodbg="";
-$dll_names_dbg="";
-
-foreach my $nm (@dll_names) {
-   $dll_names_nodbg.=" ".$nm.".dll";
-   $dll_names_dbg.=" ".$nm."_d.dll";
-}
-
-# 0x60000000 is the recommended base address for user dll addr space
-$baseaddr="0x60000000";
-$dllbasefile="dllbase.txt";
-$basedlllogfilename="log.txt";
-
-# rebase will modify input dlls, so make tmp copies of them
-if(!(-d "tmp")) {
-   system("mkdir tmp");
-}
-chdir("tmp");
-unlink($basedlllogfilename);
-
-############################
-### do release
-
-$archivepath=$archive_root."release";
-
-# need to remove existing files or rebase will just append to them
-open(OUTFILE, ">$dllbasefile") || die "Couldn't open $dllbasefile!\n";
-print OUTFILE $headerstr;
-print OUTFILE "\n; release dlls\n\n";
-close(OUTFILE);
-
-foreach my $dir1 (@modules) {    
-   my @args=("cmd.exe","/c","copy ".$archivepath."\\$dir1\\lib\\*.dll .");
-   system(@args);
-}
-
-$argstr="-v -b $baseaddr -c $dllbasefile -l $basedlllogfilename $dll_names_nodbg";
-
-#@args=("cmd.exe","/C","rebase.exe $argstr");
-#print $args[0]." ".$args[1]." ".$args[2]."\n";
-@args=("rebase.exe $argstr");
-print $args[0]."\n";
-system(@args);
-
-############################
-### do debug
-
-open(OUTFILE, ">>$dllbasefile") || die "Couldn't open $dllbasefile!\n";
-print OUTFILE "\n; debug dlls\n\n";
-close(OUTFILE);
-
-$archivepath=$archive_root."debug";
-foreach my $dir1 (@modules) {    
-   my @args=("cmd.exe","/c","copy ".$archivepath."\\$dir1\\lib\\*.dll .");
-   system(@args);
-}
-
-$argstr="-v -b $baseaddr -c $dllbasefile -l $basedlllogfilename $dll_names_dbg";
-#@args=("cmd.exe","/C","rebase.exe $argstr");
-#print $args[0]." ".$args[1]." ".$args[2]."\n";
-@args=("rebase.exe $argstr");
-print $args[0]."\n";
-system(@args);
-
-#cygwin d2u seems to not work rite
-$d2u_path=$ENV{'HOME'}."/player/wintools/bin";
-$ENV{'PATH'}=$d2u_path.":".$ENV{'PATH'};
-print $ENV{'PATH'},"\n";
-@args=("dos2unix",$dllbasefile);
-print $args[0]." ".$args[1]." ".$args[2]."\n";
-system(@args);
-
-print "do cp tmp/dllbase.txt ~/player/dtool/src/dtoolbase\n";
-
-exit(0);
-
-

+ 0 - 42
pandatool/src/scripts/binreplace.pl

@@ -1,42 +0,0 @@
-#!perl
-if($#ARGV<2) {
-    print "Usage: perl binreplace.pl [-i] [findstr] [replacestr] [filename]\n";
-    exit(1);
-}
-
-$argnum=0;
-$case_insensitive = 0;
-if($ARGV[0] eq "-i") {
-  $argnum=1;
-  $case_insensitive = 1;
-}
-$findstr =  $ARGV[$argnum];   $argnum++;
-$replacestr = $ARGV[$argnum]; $argnum++;
-$filename = $ARGV[$argnum];   $argnum++;
-
-$filenamebak = $filename.".bak";
-$retval = rename($filename,$filenamebak);
-if(! $retval) {
-   die "rename(".$filename.",".$filenamebak.") failed!\n";
-}
-
-print "replacing '".$findstr."' with '".$replacestr."' in ".$filename."\n";
-
-# for some reason, you need to double the $findstr \'s but not the replacestr ones
-
-$findstr =~ s/\\/\\\\/g;
-#$replacestr =~ s/\\/\\\\/g;
-
-open IN, $filenamebak or die "can't read ".$filenamebak." $!";
-open OUT, ">$filename" or die "can't create ".$filename.": $!";
-binmode IN;
-binmode OUT;
-
-if($case_insensitive) {
-  s/$findstr/$replacestr/gi, print OUT while <IN>;
-} else {
-  s/$findstr/$replacestr/g, print OUT while <IN>;
-}
-close OUT;
-close IN;
-unlink($filenamebak);

+ 0 - 207
pandatool/src/scripts/builder.cshrc

@@ -1,207 +0,0 @@
-set prompt='%m:%B%~%b> '
-alias ls 'ls -C -F'
-alias dir ls -C -F -l
-alias vi vim
-alias fd ftp dumbo
-alias tz tar zxvf
-alias spo1 setenv PANDA_OPTIMIZE 1
-alias spo2 setenv PANDA_OPTIMIZE 2
-alias spo3 setenv PANDA_OPTIMIZE 3
-alias spo4 setenv PANDA_OPTIMIZE 4
-alias snoi setenv NO_INTERROGATE 1
-alias usnoi unsetenv NO_INTERROGATE
-alias set_intel setenv USE_COMPILER INTEL
-alias set_msvc setenv USE_COMPILER MSVC
-
-alias cpd  'cd $PANDA/src'
-#alias emacs xemacs
-#alias em xemacs
-alias mi make install
-alias ni nmake install
-alias dh demo /install/models/herc-6000.egg /install/models/HB_1_HE1.egg
-set nobeep=1
-
-if(! $?TCSH_NO_CHANGEPATH) then
-# have to manually put '\' in front of spaces for this to work
-# this is completely reset at file end
-set oldpath=($path)
-set path=(./ /bin /usr/local/bin /mscommon/Tools/WinNT /mscommon/MSDev98/Bin /mscommon/Tools /msvc98/Bin /mspsdk/Bin /mspsdk/Bin/WinNT /c/WINNT/System32/Wbem /c/PROGRA~1/TCL/bin /c/Program\ Files/Resource\ Pro\ Kit/ /c/Program\ Files/Resource\ Kit/ /c/WINNT/system32 /c/WINNT /c/bin /c/xemacs/bin/i686-pc-cygwin /emacs-20.7/bin)
-endif
-
-# my defaults for panda build
-if (! $?PANDA_OPTIMIZE ) then
-setenv PANDA_OPTIMIZE 2
-endif
-
-setenv CL_MAKE_BROWSE_INFO 0
-alias setbrowseinfo1 setenv CL_MAKE_BROWSE_INFO 1
-alias setbrowseinfo0 setenv CL_MAKE_BROWSE_INFO 0
-
-setenv HAVE_GL yes
-setenv HAVE_DX9 yes
-setenv USE_NSPR t
-
-if (! $?USER ) then
-setenv USER georges
-endif
-
-if (! $?CYGWIN_ROOT) then
-# may cause tcsh hang
-setenv CYGWIN_ROOT `cygpath -w /`
-endif
-
-setenv PENV_COMPILER WIN32_VC
-setenv PENV WIN32
-setenv PANDA_ROOT C:/Cygwin
-
-setenv CVSROOT :pserver:cxgeorge@dimbo:/fit/cvs
-#setenv CVS_PASSFILE ~/.cvspass
-
-# check out files read-only
-# setenv CVSREAD 1
-
-if (! $?PANDA_BUILD_TYPE) then
-setenv PANDA_BUILD_TYPE gmsvc
-endif
-
-if (! $?PPREMAKE_CONFIG) then
-#setenv PPREMAKE_CONFIG /usr/local/etc/Config.pp
-#WINTOOLS may not be set, so do this instead
-setenv PPREMAKE_CONFIG $HOME/player/wintools/panda/etc/Config.pp
-endif
-
-# for ppremake
-#set path=($path /usr/local/panda/bin)
-# /usr/local/panda/bin for ppremake
-if(! $?TCSH_NO_CHANGEPATH) then
-# set path=(/bin /contrib/bin $path ~/scripts $path /usr/local/panda/bin)
-
-# builder.pl doesnt want initial path changed, except to add these things
-set path=(~/scripts $path)
-endif
-
-
-
-if (! $?TCSH_NO_PANDA_ATTACH ) then
-# builder scripts don't attach (attach scripts too buggy on cygwin 1.0)
-# they set paths manually
-# setenv TOOL /install/tool
-setenv MYTOOL ~/player/dtool
-setenv MYTOOL_CSHRC $MYTOOL/src/attach/dtool.cshrc
-#echo "   checking for dtool.cshrc"
-
-if(-e $MYTOOL_CSHRC) then
-setenv DTOOL $MYTOOL
-#setenv CTATTACH_DEBUG 1
-#echo "  found my dtool.cshrc"
-source $DTOOL/etc/dtool.cshrc personal
-cta wintools personal
-cta panda personal
-cta direct personal
-cta toontown personal
-cd ~/player/panda
-# else
-# echo "WARNING: $TOOL_CSHRC doesnt exist, panda env setup failed!"
-# cd /install
-else
-
-setenv DTOOL /g/player/install/win2k/dtool
-source $DTOOL/src/attach/dtool.cshrc install
-endif
-
-alias ctp "cta panda personal;cta wintools personal"
-alias ctt "cta direct personal;cta toontown personal"
-cta wintools personal  
-cta panda personal
-cta direct personal
-cta toontown personal
-
-if(! $?TCSH_NO_CSHRC_CHDIR ) then
-cd $HOME/player/panda
-endif
-
-else
-  if(! $?TCSH_NO_CHANGEPATH) then
-   set path=($oldpath $path)
-  endif
-endif
-
-# this version of emacs ignores cygwin root, cant give it cygwin paths
-#set path=(/cygdrive/c/progra~1/XEmacs/XEmacs-21.1.9/i386-pc-win32 /bin /contrib/bin $path)
-#set path=( /bin /contrib/bin /cygdrive/c/python16 $path )
-#set path=( /bin /contrib/bin $path ~/scripts /usr/local/winpandatools/win98)
-set path=( /bin /contrib/bin $path ~/scripts)
-set path=(/intel/compiler60/ia32/bin /intel/iselect/bin /intel/edb $path)
-
-#set path=($path /cygdrive/c/progra~1/micros~1/common/msdev98/bin /cygdrive/c/progra~1/micros~1/common/tools/winnt /cygdrive/c/progra~1/micros~1/common/tools /cygdrive/c/progra~1/micros~1/vc98/bin /cygdrive/c/winnt /cygdrive/c/winnt/system32 /cygdrive/c/bin)
-#set lib = (/cygdrive/c/progra~1/micros~1/vc98/lib /cygdrive/c/progra~1/micros~1/vc98/mfc/lib)
-# note:  have to set vc envvars in sys env vars
-#cd $HOME
-unset owd
-
-
-alias md mkdir
-alias pp ppremake
-alias ppr ppremake
-alias wlastchng ~/scripts/wlastchng.pl
-alias ni nmake install
-alias listincs-all '(grep -h include `(echo *cxx | sed -e "s/test_[^ ]*//g")` | sort | uniq ) | (grep -v \");(echo ""); (grep -h include `(echo *cxx | sed -e "s/test_[^ ]*//g")` | sort | uniq ) | (grep \");'
-alias listincs-rep '(grep -h include `(echo *cxx | sed -e "s/test_[^ ]*//g")` | sort | uniq -d) | (grep -v \");(echo ""); (grep -h include `(echo *cxx | sed -e "s/test_[^ ]*//g")` | sort | uniq -d) | (grep \");'
-alias listincs-sing '(grep include `(echo *cxx | sed -e "s/test_[^ \t]*//g")` | /bin/sort +1 | uniq -u -f 1 | /bin/sort);'
-alias listincs-old '(grep -h include *cxx | sort | uniq ) | (grep -v \");echo ""; (grep -h include *cxx | sort | uniq ) | (grep \");'
-alias listincs '(grep -h include *cxx | sort | uniq ) | (grep -v \"); (grep -h include *cxx | sort | uniq ) | (grep \");'
-alias prproc 'echo $NUMBER_OF_PROCESSORS'
-alias setproc1 setenv NUMBER_OF_PROCESSORS 1
-alias setproc2 setenv NUMBER_OF_PROCESSORS 2
-alias setproc4 setenv NUMBER_OF_PROCESSORS 4
-alias setgenass setenv GEN_ASSEMBLY 1
-alias usetgenass unsetenv GEN_ASSEMBLY
-alias mroe more
-
-alias ctp "cta panda personal;cta wintools personal"
-alias mktool 'cd $DTOOL/src/build;./initialize make;cd $DTOOL;make install'
-#alias cpdll 'cp -p $PANDA/src/all/pandadx/*dll $PANDA/src/all/panda/*dll $PANDA/src/all/pandaegg/*dll $PANDA/lib;cp -p $PANDA/src/all/pandadx/lib*pdb $PANDA/src/all/panda/lib*pdb $PANDA/src/all/pandaegg/lib*pdb $PANDA/lib'
-alias mkdx  'cd ~/player/panda/src/dxgsg; make install; cd ../wdxdisplay; make install; cd ../../metalibs/pandadx; make install; cd ~/player/panda/src/dxgsg'
-alias mkdemo 'cd ~/player/panda/src/framework; make install; cd ../testbed; rm Opt*/demo.exe; make install; cd ~/player/panda/src/framework'
-alias mkpp  'cd ~/player/panda/src/physics; make install; cd ../particlesystem; make install; cd ../../metalibs/pandaphysics; make install; cd ~/player/panda/src/dxgsg'
-# alias mkdemo 'cd ~/player/panda/src/framework; make install; cd ../testbed; make clean; make install; cd ~/player/panda/src/framework'
-alias mkdemo 'cd ~/player/panda/src/framework; make install; cd ../testbed; rm Opt*/*.exe; make install; cd ~/player/panda/src/framework'
-alias mkgl  'cd ~/player/panda/src/glgsg; make install; cd ../wgldisplay; make install; cd ../../metalibs/pandagl; make install; cd ../../src/panda/wgldisplay'
-alias mkegg  'cd ~/player/panda/src/egg; make install; cd ../builder; make install; cd ../egg2sg; make install; cd ../../metalibs/pandaegg; make install; cd ~/player/panda/src/dxgsg'
-alias cpdxbak 'chmod a+w $PANDA/dx-bak/*;cp $PANDA/src/dxgsg/*.? $PANDA/src/wdxdisplay/*.? $PANDA/dx-bak'
-alias tlinit 'cd $DTOOL/src/build; ./initialize make; cd $DTOOL'
-alias setctdbg 'setenv CTATTACH_DEBUG 1'
-alias update cvs update
-alias cvhist cvs history -a
-alias log cvs log
-alias updn 'cvs -n update -R -d \!* |& egrep -v "Updating|^\?"'
-alias cvdiff cvs diff
-alias cvlog ~/scripts/cvlog.pl
-alias updr 'cvs update -R -d \!* |& egrep -v "Updating|^\?"'
-alias upd  'cvs update -d \!* |& egrep -v "Updating|^\?"'
-alias chm 'chmod a+w *'
-alias lastchng ~/scripts/lastchng.pl
-alias wnewdiff 'cvs update -p -r HEAD  \!* > junk ; windiff junk \!* &'
-#only works if cur ver differs from checked in version
-#alias newdiff 'cvs diff -r`log -h \!* | grep head | sed -e "s/head: //"` \!*'
-# turns out all you need is this
-alias newdiff 'cvs diff -r HEAD -w \!*'
-# need version that picks out last 2 revs and does the diff
-alias cvsclean "find \!* -path '*CVS*' -prune -or -not -name 'bldlog*' -and -not -type d -print | xargs --no-run-if-empty -n 40 rm"
-
-alias genpy4 '~/player/direct/bin/genPyCode  win-publish'
-alias genpy1 '~/player/direct/bin/genPyCode  win-debug'
-alias genpy2 '~/player/direct/bin/genPyCode  win-debug'
-alias genpy3 '~/player/direct/bin/genPyCode  win-release'
-alias nd newdiff
-
-# setenv LOCAL_PPREMAKE_CONFIG ~/player/MyConfig.pp
-
-alias ppy1 'ppython -d `cygpath -w $DIRECT/bin/generatePythonCode` -v -d `cygpath -w $DIRECT/lib/py` -e `cygpath -w  $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect libtoontown'
-setenv ZPAN /z/cygwin/home/builder/player/panda
-setenv XPAN /x/cygwin/home/georges/player/panda
-unalias emacs
-
-alias setcfgdbg setenv CONFIG_CONFIG ':configdbg=1:configpath=CFG_PATH:configpath=ETC_PATH'
-alias usetcfgdbg setenv CONFIG_CONFIG 'configpath=CFG_PATH:configpath=ETC_PATH'
-alias s source

+ 0 - 761
pandatool/src/scripts/builder.pl

@@ -1,761 +0,0 @@
-#!perl
-
-#NOTE:  this script assumes you are running the Cygwin perl, which uses the
-#       Cygwin file paths (i.e. '/' corresponds to 'C:\cygwin')
-
-my $WIN_INSTALLDIR="\\\\dimbo\\panda\\win";
-my $scriptpath = "C:\\cygwin\\home\\builder\\scripts";
-
-# $ENV{'USE_COMPILER'} = "INTEL";   #  experiment
-
-# my $WIN_INSTALLDIR="\\\\cxgeorge-d01\\c\\win";
-
-### DEBUG SETTINGS
-# my $DEBUG_TREECOPY = 1;
-# my $DEBUG_GENERATE_PYTHON_CODE_ONLY = 1;
-# my $DEBUG_MAKEBSC_ONLY=1;
-
-if ($ENV{'DEBUG_GENERATE_PYTHON_CODE_ONLY'} ne '') {
-  $DEBUG_GENERATE_PYTHON_CODE_ONLY = 1;
-}
-# my $DO_ARCHIVE_AND_COPY_ONLY = 1;
-my $DONT_ARCHIVE_OLD_BUILDS = 0;
-my $BLD_DTOOL_ONLY=0;
-
-my $DIRPATH_SEPARATOR=':';   # set to ';' for non-cygwin NT perl
-
-my @inst_dirnames=("archive","debug","install","release","publish");
-my $ARCHIVENUM=0;
-my $DEBUGNUM=1;
-my $INSTALLNUM=2;
-my $RELEASENUM=3;
-my $PUBLISHNUM=4;
-my @inst_dirs;
-for(my $i=0;$i<=$#inst_dirnames;$i++) {
-    $inst_dirs[$i]=$WIN_INSTALLDIR."\\".$inst_dirnames[$i];
-}
-
-my $VC7_BINDIRS="/msvc7/Vc7/bin".$DIRPATH_SEPARATOR."/msvc7/Common7/Tools/Bin".$DIRPATH_SEPARATOR."/msvc7/Common7/Tools".$DIRPATH_SEPARATOR."/msvc7/Common7/IDE";
-
-#if(! $DEBUG_GENERATE_PYTHON_CODE_ONLY) {
-#    $ENV{'PANDA_OPTIMIZE'}='4';  # var has meaning to my special Config.pp
-#}
-
-$ENV{'WINTOOLS'} = '/home/builder/player/wintools';
-#$ENV{'PPREMAKE_CONFIG'} = '/usr/local/etc/Config.pp';  old location
-$ENV{'PPREMAKE_CONFIG'} = $ENV{'WINTOOLS'}.'/panda/etc/Config.pp';
-$ENV{'PPREMAKE_PLATFORM'} = 'Win32';  # generate OptX-Win32 dirs instead of OptX-Cygwin
-$ENV{'TCSH_NO_CSHRC_CHDIR'}='1';
-$ENV{'ENABLE_PROFILING'}='1';    # generate .map files
-
-# needed to add this to fix version.rc path in ppremake?
-$ENV{'DTOOL'} = '/home/builder/player/dtool';
-
-$ENV{'HOME'}="/home/builder";
-$ENV{'USER'}="builder";
-$ENV{'USERNAME'}=$ENV{'USER'};
-
-my $DONT_ARCHIVE_OLD_BUILDS = (($ENV{'DONT_ARCHIVE_OLD_BUILDS'} ne "") || $DONT_ARCHIVE_OLD_BUILDS);
-
-sub logmsg() {
-   my $msg = shift;
-   print $msg."\n";
-   open(LOGFILE,">>".$fulllogfilename) || die "can't open log file '$fulllogfilename'\n";
-   print LOGFILE $msg."\n";
-   close(LOGFILE);
-}
-
-#could change this to use eval, but it would require doubling the '\''s again in filename
-sub mychdir() {
-  my $newdir = shift;
-  my $retval = chdir($newdir);
-  &logmsg("chdir(".$newdir.")");
-  if(! $retval) {
-      &logmsg("chdir(".$newdir.") failed!!");
-      exit(1);
-  }
-}
-
-sub mymkdir() {
-    my $newdir=shift;
-    if(!(-e $newdir)) {
-      if(!mkdir($newdir,0xfff)) {
-       &logmsg("cant create new dir '".$newdir."' !!");
-       exit(1);
-      }
-    }
-}
-
-sub myrename() {
-  my $n1 = shift;
-  my $n2 = shift;
-  my $retval;
-
-  &logmsg("rename(".$n1.",".$n2.")");
-
-  if(-e $n2) {
-
-      # find name we can move old target to
-      my $newnum=1;
-      while(-e $n2.".old.".$newnum) {
-          $newnum++;
-      }
-
-      $newconflicttargetname=$n2.".old.".$newnum;
-      &logmsg("avoiding rename conflict, renaming old ".$n2." to ".$newconflicttargetname);
-      $retval = rename($n2,$newconflicttargetname);
-      if(! $retval) {
-          &logmsg("rename failing, giving up (check if files or dirs are open in other apps)");
-          exit(1);
-      }
-  }
-
-  $retval = rename($n1,$n2);
-  if(! $retval) {
-      &logmsg("rename(".$n1.",".$n2.") failed!!!  (check if files or dirs are open in other apps)");
-      exit(1);
-  }
-}
-
-sub myexecstr() {
-  my $cmdstr = shift;
-  my $errstr = shift;
-  my $dologstr = shift;
-  my $exec_cshrc_type = shift;
-
-  if($dologstr eq "DO_LOG") {
-      if($exec_cshrc_type eq "NT cmd") {
-          $cmdstr.=" >> ".$fulllogfilename_win." 2>&1";  # 2>&1 tells nt cmd.exe to redirect stderr to stdout
-      } else {
-          $cmdstr.=" >>& ".$fulllogfilename;   # for tcsh
-      }
-
-      &logmsg($cmdstr);
-  }
-
-  my $savedhome = $ENV{'HOME'};
-
-  if( $exec_cshrc_type eq "NO_CSHRC") {
-     # change $HOME so .cshrc doesn't get sources by tcsh
-     $ENV{'HOME'}="/";
-  } elsif( $exec_cshrc_type eq "NO_PANDA_ATTACH") {
-     $ENV{'TCSH_NO_PANDA_ATTACH'}="1";
-  }
-
-  if($exec_cshrc_type eq "NT cmd") {
-      my @args = ("cmd.exe", "/c", "$cmdstr");
-      $retval = system(@args);
-  } else {
-      my @args = ("tcsh.exe", "-c", "$cmdstr");
-      $retval = system(@args);
-  }
-
-  if($retval!=0) {
-      if(($retval>=256) || ($retval<=-256)) {
-         $retval= $retval/256;  # actual retval
-      }
-      if($errstr eq "") {
-         &logmsg($cmdstr." failed!!!!!  continuing anyway...\nError return value=".$retval);
-      } elsif($errstr ne "nomsg") {
-         &logmsg($errstr."\nError return value=".$retval);
-         exit($retval);
-      }
-  }
-
-  if($exec_cshrc_type eq "NO_CSHRC") {
-      $ENV{'HOME'}=$savedhome;
-  } elsif( $exec_cshrc_type eq "NO_PANDA_ATTACH") {
-     delete $ENV{'TCSH_NO_PANDA_ATTACH'};
-  }
-}
-
-sub gettimestr() {
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday) = localtime(time);
-    $mon++;
-    return $mon."/".$mday." ".$hour.":".($min<10 ? "0":"").$min;
-}
-
-sub appendpath() {
-# note cygwin perl.exe requires ':' instead of ';' as path dir separator
-  foreach $dir1 (@_) {
-      $ENV{'PATH'}.=$DIRPATH_SEPARATOR.$CYGBLDROOT.$dir1;
-  }
-}
-
-sub make_bsc_file() {
-    &logmsg("*** Generating panda.bsc at ".&gettimestr()." ***");
-
-#    &mychdir($CYGBLDROOT."/debug");
-#    $outputdir=$WINBLDROOT."\\debug";
-
-    &mychdir($CYGBLDROOT);
-    $outputdir=$WINBLDROOT;
-
-    $outputname="panda.bsc";
-    $outputfilepath=$outputdir."\\".$outputname;
-    $cmdfilepath=$outputdir."\\makebsc.txt";
-
-    #open(FILES, "where -r . *.sbr |") || die "Couldn't run 'where'!\n";
-    #requires unix/cygwin style find.exe
-
-    open(FILES, "find ".$dirstodostr." -name \"*.sbr\" -print |") || die "Couldn't run 'find'!\n";
-
-    open(OUTFILE, ">".$cmdfilepath) || die "Couldn't open ".$cmdfilepath."!\n";
-
-    $filename = <FILES>;  #skip initial line
-    $filestr="";
-
-    $duline = <FILES>;
-    chop $duline;
-    $filestr=$duline;
-
-    while ($duline = <FILES>)
-    {
-            chop $duline;  # Remove the newline from the end of the filename
-            $filestr=$filestr."\n".$duline;
-    }
-
-    print OUTFILE "/n /o ".$outputfilepath." \n";
-    print OUTFILE "$filestr","\n";
-    close(OUTFILE);
-    close(FILES);
-
-    # vc7 dirs are not in path env-var by default
-    $ENV{'PATH'}=$VC7_BINDIRS.$DIRPATH_SEPARATOR.$ENV{'PATH'};
-    print $ENV{'PATH'}, "\n";
-
-    $bscmake_str="bscmake /o ".$outputfilepath." @".$cmdfilepath."\n";
-    &myexecstr($bscmake_str,"bscmake failed!!!","DO_LOG","NT cmd");
-
-    # edit binary so it looks for src on mountable Z drive, so src browsing
-    # works with Z:\ pointed to \\dragon
-
-    $binreplace_str="perl ".$scriptpath."\\binreplace.pl -i C:\\cygwin Z:\\cygwin ".$outputfilepath."\n";
-    &myexecstr($binreplace_str,"binreplace failed!!!","DO_LOG","NT cmd");
-
-    &myexecstr("copy ".$outputfilepath." ".$inst_dirs[$DEBUGNUM], "copy of ".$outputfilepath." failed!!", "DO_LOG","NT cmd");
-    unlink($cmdfilepath);
-    &mychdir($CYGBLDROOT);
-    &logmsg("*** Finished generating panda.bsc at ".&gettimestr()." ***");
-}
-
-sub addpathsfromfile() {
-    my $dirname = shift;
-    my $envvarname = shift;
-
-    my $pathfile=$WINBLDROOT."\\".$dirname."\\src\\configfiles\\".$dirname.".pth";
-    if(!open(PTHFILE, $pathfile)) {
-       &logmsg("Couldn't open ".$pathfile."!");
-       exit(1);
-    }
-
-    my @filestrs=<PTHFILE>;
-    close(PTHFILE);
-    foreach my $i (@filestrs) {
-      chop($i);
-      $i =~ s/\//\\/g;  # switch fwdslash to backslsh
-#      print $i,"\n";
-      $ENV{$envvarname}.=";".$WINBLDROOT."\\".$dirname."\\".$i;
-    }
-
-}
-
-sub AddPckgPath() {
-  my $pckg = shift;
-  $ENV{'PATH'}.=":".$ENV{$pckg}."/bin:".$ENV{$pckg}."/lib";
-}
-
-sub gen_python_code() {
-
-    &logmsg("*** GenPythonCode Start for ".$inst_dirnames[$treenum]." at ".&gettimestr()." ***");
-
-    &mychdir($CYGBLDROOT."/direct/bin");
-
-    # ETC_PATH required by generatePythonCode?
-    $ENV{'ETC_PATH'}='/home/builder/player/panda/etc /home/builder/player/direct/etc /home/builder/player/dtool/etc /home/builder/player/toontown/etc /home/builder/player/pandatool/etc';
-
-    my $origpath=$ENV{'PATH'};  # save now, restore path after done
-
-    # start new path just for this fn
-    $ENV{'PATH'}="/bin";
-
-    &AddPckgPath('WINTOOLS');
-    &AddPckgPath('DTOOL');
-    &AddPckgPath('PANDATOOL');
-    &AddPckgPath('PANDA');
-    &AddPckgPath('DIRECT');
-    &AddPckgPath('TOONTOWN');
-
-#    $ENV{'PATH'}=$ENV{'WINTOOLS'}."/bin:".$ENV{'WINTOOLS'}."/lib:/bin:/contrib/bin:/mscommon/Tools/WinNT:/mscommon/MSDev98/Bin:/mscommon/Tools:/msvc98/bin:/home/builder/player/dtool/bin:/home/builder/player/dtool/lib:/home/builder/player/direct/bin:/home/builder/player/direct/lib::/home/builder/player/toontown/bin:/home/builder/player/toontown/lib:/home/builder/player/panda/lib:/home/builder/player/panda/bin:/usr/local/bin:.:/c/WINNT/system32:/c/WINNT:/c/WINNT/System32/Wbem:/c/bin:/mspsdk/Bin/:/mspsdk/Bin/WinNT:/mscommon/Tools/WinNT:/mscommon/MSDev98/Bin:/mscommon/Tools:/msvc98/bin:/home/builder/scripts:/home/builder/player/pandatool/bin:/home/builder/player/pandatool/lib";
-    $ENV{'PATH'}.=":/mscommon/Tools/WinNT:/mscommon/MSDev98/Bin:/mscommon/Tools:/msvc98/bin:/usr/local/bin:.:/c/WINNT/system32:/c/WINNT:/c/bin:/mspsdk/Bin/:/mspsdk/Bin/WinNT:/mscommon/Tools/WinNT:/mscommon/Tools:/home/builder/scripts:";
-    $ENV{'PATH'}.=$ENV{'WINTOOLS'}."/sdk/python/Tcl/bin:".$ENV{'WINTOOLS'}."/sdk/python/Tcl/lib";
-
-    $ENV{'PYTHONPATH'}= $WINBLDROOT."\\direct\\src\\showbase;".$WINBLDROOT."\\panda\\lib;".$WINBLDROOT."\\dtool\\lib;".$WINBLDROOT."\\wintools\\bin;".$WINBLDROOT."\\wintools\\lib;";
-    $ENV{'PYTHONPATH'}.= $WINBLDROOT."\\wintools\\sdk\\python\\Python-2.2\\Lib;".$WINBLDROOT."\\wintools\\sdk\\python\\Python-2.2\\DLLs;";
-    # direct/src/showbase/sitecustomize.py will add paths based on CTPROJS
-    $ENV{'CTPROJS'}="TOONTOWN:personal DIRECT:personal PANDA:personal WINTOOLS:personal DTOOL:personal";
-
-#    my $directsrcroot=$WINBLDROOT."\\direct\\src";
-
-#   this should be unnecessary if sitecustomize.py sees CTPROJS
-#    # add stuff from etc/[dir].pth
-#    &addpathsfromfile("direct","PYTHONPATH");
-#    &addpathsfromfile("toontown","PYTHONPATH");
-
-    $ENV{'TCSH_NO_CHANGEPATH'}='1';
-
-# old way that tried to do genPyCode directly
-#    $outputdir = $WINBLDROOT."\\direct\\lib\\py";
-#    &mymkdir($outputdir);
-#    $outputdir.= "\\Opt".$ENV{'PANDA_OPTIMIZE'}."-Win32";
-#    &mymkdir($outputdir);
-# now back to 1 build-type per tree
-#
-#    my $genpyth_str;
-#    my $genargstr="-v -d";
-#
-#    if(($ENV{'PANDA_OPTIMIZE'} eq '1') || ($ENV{'PANDA_OPTIMIZE'} eq '2')) {
-#       $genpyth_str="python_d -v -OO ";
-#       $genargstr="-O ".$genargstr;
-#    } else {
-#       $genpyth_str="python -v -O ";
-#       $genargstr="-O ".$genargstr;
-#    }
-#    $genpyth_str.="generatePythonCode ".$genargstr." '".$outputdir."' -e '".$WINBLDROOT."\\direct\\src\\extensions' -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect libtoontown";
-#   &myexecstr($genpyth_str,"generate python code failed!!!","DO_LOG","NO_PANDA_ATTACH");
-
-    $genpy_args{'1'} = 'win-debug';
-    $genpy_args{'2'} = 'win-debug';
-    $genpy_args{'3'} = 'win-release';
-    $genpy_args{'4'} = 'win-publish';
-
-    $genpy_arg1 = "-t ".$genpy_args{$ENV{'PANDA_OPTIMIZE'}};
-    &myexecstr("genPyCode ".$genpy_arg1,"genPyCode failed","DO_LOG","NO_PANDA_ATTACH");
-
-    $ENV{'PATH'}=$origpath;
-    delete $ENV{'TCSH_NO_CHANGEPATH'};
-    &mychdir($CYGBLDROOT);
-    &logmsg("*** GenPythonCode Finished for ".$inst_dirnames[$treenum]." at ".&gettimestr()." ***");
-}
-
-my $newdayarchivedirname;
-
-sub archivetree() {
-    $treenum=shift;
-
-    if(!(-e $inst_dirs[$treenum])) {
-        return;
-    }
-
-    if($newdayarchivename eq "") {
-
-        ($devicenum,$inodenum,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks)
-           = stat($inst_dirs[$treenum]."\\dtool\\Sources.pp");
-        ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)
-           = localtime($mtime);
-        $mon++;
-
-        $newdayarchivedirname=$inst_dirs[$ARCHIVENUM]."\\".($mon<10 ? "0":"").$mon."-".($mday<10 ? "0":"").$mday;
-        &mymkdir($newdayarchivedirname);
-    }
-
-    &logmsg("*** Archiving ".$inst_dirnames[$treenum]." build on install server at ".&gettimestr()." ***");
-
-    my $archdirname=$newdayarchivedirname."\\".$inst_dirnames[$treenum];
-
-    &myrename($inst_dirs[$treenum],$archdirname);
-
-    foreach my $dir1 (@dirstodolist) {
-        # copy DLL .pdb/.map up to lib dir so we can blow away metalibs subdir
-        # could do this is the makefiles instead
-        &myexecstr("( for /R ".$archdirname."\\".$dir1."\\metalibs %i in (lib*.pdb lib*.map) do copy %i ".$archdirname."\\".$dir1."\\lib )","nomsg","DO_LOG","NT cmd");
-
-        if($dir1 eq "panda") {
-            # dll/exe not under metalibs
-            &myexecstr("( for /R ".$archdirname."\\".$dir1."\\src\\audiotraits %i in (lib*.pdb lib*.map) do copy %i ".$archdirname."\\".$dir1."\\lib )","nomsg","DO_LOG","NT cmd");
-            &myexecstr("( for /R ".$archdirname."\\".$dir1."\\src\\shader %i in (lib*.pdb lib*.map) do copy %i ".$archdirname."\\".$dir1."\\lib )","nomsg","DO_LOG","NT cmd");
-            &myexecstr("( for /R ".$archdirname."\\".$dir1."\\src\\testbed %i in (*.pdb *.map) do copy %i ".$archdirname."\\".$dir1."\\bin )","nomsg","DO_LOG","NT cmd");
-        }
-
-        # NT cmd 'for' always returns 144 for some reason, impossible to detect error cond, so just don't check retval
-        # delete old objs/pdbs/etc out of archived trees (just blow away the Opt[Win32] dir)
-        # &myexecstr("( for /D /R ".$archdirname."\\".$dir1."\\src %i in (Opt*Win32) do rd /s /q %i )","nomsg","DO_LOG","NT cmd");
-
-        # instead blow away src,CVS,include,metalibs dirs completely
-        # doing every rd twice since windows-samba-RAID link seems to screw up and cause some files to not be deleted the 1st time
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\src","nomsg","DO_LOG","NT cmd");
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\CVS","nomsg","DO_LOG","NT cmd");
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\include","nomsg","DO_LOG","NT cmd");
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\metalibs","nomsg","DO_LOG","NT cmd");
-
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\src","nomsg","DO_LOG","NT cmd");
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\CVS","nomsg","DO_LOG","NT cmd");
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\include","nomsg","DO_LOG","NT cmd");
-        &myexecstr("rd /s /q ".$archdirname."\\".$dir1."\\metalibs","nomsg","DO_LOG","NT cmd");
-
-        # del xtra files at root of subdirs
-        &myexecstr("del /Q /F ".$archdirname."\\".$dir1."\\*","nomsg","DO_LOG","NT cmd");
-    }
-
-    # delete old browse files
-    &myexecstr("del /q ".$archdirname."\\*.bsc","nomsg","DO_LOG","NT cmd");
-
-    # delete wintools, right now its too big to archive
-    &myexecstr("rd /s /q ".$archdirname."\\wintools","nomsg","DO_LOG","NT cmd");
-    &myexecstr("rd /s /q ".$archdirname."\\wintools","nomsg","DO_LOG","NT cmd");
-
-    # could also move .pdb from metalibs to lib, then del metalibs, include, src dirs
-}
-
-sub checkoutfiles {
-    my $existing_module_str="";
-    my $nonexisting_module_str="";
-
-   &mychdir($CYGBLDROOT);
-
-    foreach my $dir1 (@dirstodolist) {
-        if(-e $dir1) {
-            $existing_module_str.=$dir1." ";
-        } else {
-            $nonexisting_module_str.=$dir1." ";
-        }
-    }
-
-    if($existing_module_str ne "") {
-        # flaw: will bomb if any CVS subdirs are missing
-
-        &myexecstr("( for /D /R . %i in (Opt*Win32) do rd /s /q %i )","nomsg","DO_LOG","NT cmd");
-
-        &logmsg("*** REMOVING ALL FILES IN OLD SRC TREES ***");
-        # use cvs update to grab new copy
-        # note: instead of blowing these away, may want to rename and save them
-        # also, I could just blow everything away and check out again
-        # cant blow away if people are sitting in those dirs, so we do this instead
-        $rmcmd="find ".$existing_module_str." -path '*CVS*' -prune -or -not -name 'bldlog*' -and -not -type d -print | xargs --no-run-if-empty -n 40 rm";
-        #&myexecstr($rmcmd,"Removal of old files failed!","DO_LOG","NO_CSHRC");
-        &myexecstr($rmcmd,"Removal of old files failed!","DO_LOG","NO_PANDA_ATTACH");
-
-        &myexecstr("cvs update -d -R ".$existing_module_str." |& egrep -v 'Updating|^\\?'",
-                   "cvs update failed!","DO_LOG","NO_PANDA_ATTACH");
-    }
-
-    if($nonexisting_module_str ne "") {
-        &myexecstr("cvs checkout -R ".$nonexisting_module_str." |& egrep -v 'Updating|^\\?'",
-                   "cvs checkout failed!","DO_LOG","NO_PANDA_ATTACH");
-    }
-}
-
-sub buildall() {
-    $treenum=shift;
-
-    # DTOOL ppremake may have already run by DTOOL 'initialize make'
-
-        if($DO_ARCHIVE_AND_COPY_ONLY) {
-                goto 'ARCHIVE_AND_COPY';
-        }
-
-    &logmsg("*** Starting ".uc($inst_dirnames[$treenum])." Build (Opt=".$ENV{'PANDA_OPTIMIZE'}.") at ".&gettimestr()." ***");
-
-    &checkoutfiles();
-
-    # cant do attachment, since that often hangs on NT
-    # must use non-attachment build system  (BUILD_TYPE 'gmsvc', not 'stopgap', in $PPREMAKE_CONFIG)
-
-    # hacks to fix multiproc build issue (cp file to dir occurs before dir creation, need to adjust makefiles to fix this)
-    foreach my $dir1 (@dirstodolist) {
-        &mymkdir($CYGBLDROOT."/".$dir1."/etc");
-        &mymkdir($CYGBLDROOT."/".$dir1."/bin");
-        &mymkdir($CYGBLDROOT."/".$dir1."/lib");
-        &mymkdir($CYGBLDROOT."/".$dir1."/include");
-    }
-    &mymkdir($CYGBLDROOT."/dtool/include/parser-inc");  # hack to fix makefile multiproc issue
-    &mymkdir($CYGBLDROOT."/pandatool/shared");  # hack to fix makefile multiproc issue
-
-    foreach my $dir1 (@dirstodolist) {
-        my $dir1_upcase = uc($dir1);
-
-        &logmsg("*** PPREMAKE ".$dir1_upcase." (BUILDTYPE=".$ENV{'PANDA_BUILD_TYPE'}.") ***");
-        &mychdir($CYGBLDROOT."/".$dir1);
-        &myexecstr("ppremake",$dir1_upcase." ppremake failed!","DO_LOG","NO_PANDA_ATTACH");
-    }
-
-    # debug stuff
-    # &mychdir($CYGBLDROOT);
-    # &myexecstr("dir dtool","dir failed","DO_LOG","NT cmd");
-
-    $makecmd="make";
-    $shellarg="NO_PANDA_ATTACH";
-
-    if($ENV{'PANDA_BUILD_TYPE'} eq 'msvc') {
-       $makecmd="nmake";
-       $shellarg="NT cmd";
-    }
-
-    foreach my $dir1 (@dirstodolist) {
-        my $dir1_upcase = uc($dir1);
-        &logmsg("*** BUILDING ".$dir1_upcase." at ".&gettimestr()." ***");
-        &mychdir($CYGBLDROOT."/".$dir1);
-        &myexecstr($makecmd." install",$dir1_upcase." ".$makecmd." install failed!","DO_LOG",$shellarg);
-    }
-
-    &mychdir($CYGBLDROOT);  # get out of src dirs to allow them to be moved/renamed
-    unlink($CYGBLDROOT."/dtool/dtool_config.h");  # fix freakish NTFS bug, this file is regenerated by ppremake anyway
-
-    if($#dirstodolist>1) {
-       &gen_python_code();  # must run AFTER toontown bld
-    }
-
-    ARCHIVE_AND_COPY:
-
-    &mychdir($CYGBLDROOT);  # get out of src dirs to allow them to be moved/renamed
-
-    # archive old current srvr build & copy build to server, if its accessible
-    if(!(-e $WIN_INSTALLDIR)) {
-        &logmsg("ERROR: Cant access install directory!!  (Is Server down??)  ".$WIN_INSTALLDIR);
-        &logmsg("Skipping archive and copy-build-to-server steps for ".$inst_dirnames[$treenum]." build");
-        return;
-    }
-
-    if($DONT_ARCHIVE_OLD_BUILDS) {
-        &myexecstr("rd /s /q ".$inst_dirs[$treenum],"DO_LOG","NT cmd");  # don't bother checking errors here, probably just some shell has the dir cd'd to
-    } else {
-        &archivetree($treenum);
-    }
-
-    &logmsg("*** Copying ".$inst_dirnames[$treenum]." build to install server at ".&gettimestr()." ***");
-    &mymkdir($inst_dirs[$treenum]);
-
-    my $xcopy_opt_str="/E /K /C /R /Y /H /I ";
-
-    if($DEBUG_TREECOPY) {
-        $xcopy_opt_str.="/T ";  #debug only
-    }
-
-    if($treenum == $DEBUGNUM) {
-       # get rid of .sbr files before copying
-       &myexecstr("echo .sbr > C:\\junk","echo .sbr failed!!", "DO_LOG","NT cmd");
-       $xcopy_opt_str.=" /EXCLUDE:C:\\junk";
-    }
-
-    # hopefully there are no extra dirs underneath
-
-    # add wintools to dir copy list
-    # don't want to add wintools to global dirstodo, treat it separately
-    unshift(dirstodolist,"wintools");
-
-    foreach my $dir1 (@dirstodolist) {
-        &mymkdir($inst_dirs[$treenum]."\\".$dir1);
-        &myexecstr("\\WINNT\\system32\\xcopy ".$xcopy_opt_str." ".$WINBLDROOT."\\".$dir1."\\* ".$inst_dirs[$treenum]."\\".$dir1,
-                   "xcopy of ".$inst_dirnames[$treenum]." tree failed!!", "DO_LOG","NT cmd");
-    }
-    shift(dirstodolist);
-}
-
-# assumes environment already attached to TOOL/PANDA/DIRECT/TOONTOWN
-# assumes cygwin env, BLDROOT must use fwd slashes
-if($ENV{'BLDROOT'} eq "") {
-  $ENV{'BLDROOT'} = "/home/builder/player";
-}
-
-if($ENV{'CYGWIN_ROOT'} eq "") {
-  $ENV{'CYGWIN_ROOT'} = "C:\\Cygwin";
-}
-
-$CYGROOT= $ENV{'CYGWIN_ROOT'};
-$CYGROOT =~ s/(.*)\\$/$1/;   # get rid of trailing '\'
-#$CYGROOT =~ s/\\/\//g;  # switch backslash to fwdslash  (setting up for cygwin)
-
-$CYGBLDROOT = $ENV{'BLDROOT'};
-print "\$CYGBLDROOT='",$CYGBLDROOT,"'\n";
-
-if(($CYGBLDROOT eq "")||(!(-e $CYGBLDROOT))) {
-  die "Bad \$CYGBLDROOT !!\n";
-}
-
-$WINBLDROOT=$CYGROOT.$CYGBLDROOT;
-$WINBLDROOT =~ s/\//\\/g;  # switch fwdslash to backslash
-print "\$WINBLDROOT='",$WINBLDROOT,"'\n";
-
-my ($sec,$min,$hour,$mday,$mon,$year,$wday) = localtime(time);
-$mon++;
-$logfilenamebase="bldlog-".($mon<10 ? "0":"").$mon."-".($mday<10 ? "0":"").$mday.".txt";
-$fulllogfilename = $CYGBLDROOT."/".$logfilenamebase;
-$fulllogfilename_win = $WINBLDROOT."\\".$logfilenamebase;
-
-# recreate the log to blow away any old one
-open(LOGFILE,">".$fulllogfilename) || die "can't open log file '$fulllogfilename'\n";
-close(LOGFILE);
-
-&logmsg("*** Panda Build Log Started at ".&gettimestr()." ***");
-
-my @do_install_dir;
-my @dir_build_type;
-
-for($ii=0;$ii<=$#PUBLISHNUM;$ii++) {
-  if($#ARGV<0) {
-   $do_install_dir=1;
-  } else {
-   $do_install_dir=0;
-  }
-   $dir_build_type=0;
-}
-
-my $g_last_dirnum=0;
-
-for($ii=0;$ii<=$#ARGV;$ii++) {
-    if(uc($ARGV[$ii]) eq uc($inst_dirnames[$INSTALLNUM])) {
-        $g_last_dirnum=$INSTALLNUM;
-    } elsif(uc($ARGV[$ii]) eq uc($inst_dirnames[$DEBUGNUM])) {
-        $g_last_dirnum=$DEBUGNUM;
-    } elsif(uc($ARGV[$ii]) eq uc($inst_dirnames[$RELEASENUM])) {
-        $g_last_dirnum=$RELEASENUM;
-    } elsif(uc($ARGV[$ii]) eq uc($inst_dirnames[$PUBLISHNUM])) {
-        $g_last_dirnum=$PUBLISHNUM;
-    } elsif(uc($ARGV[$ii]) eq "NMAKE") {
-       $dir_build_type[$g_last_dirnum]=1;
-       next;
-    } else {
-        &logmsg("invalid argument '".$ARGV[0]."' to builder.pl.  arg must be 'install','debug', or 'release', or 'publish'\n");
-        exit(1);
-    }
-    $do_install_dir[$g_last_dirnum]=1;
-}
-
-if(!(-e $WIN_INSTALLDIR)) {
-    &logmsg("ERROR: Cant access install directory!!  ".$WIN_INSTALLDIR);
-    exit(1);
-}
-
-&mychdir($CYGBLDROOT);
-
-if($BLD_DTOOL_ONLY) {
-  @dirstodolist=("dtool");
-} else {
-  @dirstodolist=("dtool","panda","pandatool","direct","toontown");
-}
-$dirstodostr="";
-foreach my $dir1 (@dirstodolist) {
-  $dirstodostr.=$dir1." ";
-}
-
-# makes ppremake build headers, libs in module dirs (panda/lib,dtool/bin,etc), not /usr/local/panda/inc...
-foreach my $dir1 (@dirstodolist) {
-  my $dir1_upcase = uc($dir1);
-  $ENV{$dir1_upcase}=$CYGBLDROOT."/".$dir1;
-
-  # need this since we are building in src dirs, not install dir
-  # so 'interrogate' needs to find its dlls when building panda, etc
-  &appendpath("/".$dir1."/bin","/".$dir1."/lib");
-}
-
-# pick up cygwin utils
-$ENV{'PATH'}=$ENV{'WINTOOLS'}."/bin".$DIRPATH_SEPARATOR.$ENV{'WINTOOLS'}."/lib".$DIRPATH_SEPARATOR."/bin".$DIRPATH_SEPARATOR.$ENV{'PATH'}."/c/WINNT/system32".$DIRPATH_SEPARATOR."/c/WINNT";
-
-# want build to pick up python dll's from /usr/lib before /c/python16
-# $ENV{'PATH'}="/usr/lib".$DIRPATH_SEPARATOR.$ENV{'PATH'};  not needed
-
-if($DEBUG_MAKEBSC_ONLY) {
-  &make_bsc_file();
-  exit(0);
-}
-
-if(! $DEBUG_GENERATE_PYTHON_CODE_ONLY) {
-  # update wintools
-  unlink("wintools\\bin\\dos2unix.exe");  # rm a file so egrep doesnt find 0 non-Updating/?? lines and return failure
-  &myexecstr("cvs update -d -R wintools |& egrep -v 'Updating|^\\?'", "cvs update failed!","DO_LOG","NO_PANDA_ATTACH");
-}
-
-if($DEBUG_TREECOPY) {
-    goto 'DBGTREECOPY';
-}
-
-# goto 'SKIP_REMOVE';
-
-SKIP_REMOVE:
-
-# this doesnt work unless you can completely remove the dirs, since cvs checkout
-# bombs if dirs exist but CVS dirs do not.
-
-if($do_install_dir[$INSTALLNUM]) {
-  if($dir_build_type[$INSTALLNUM]) {
-    $ENV{'PANDA_BUILD_TYPE'} = 'msvc';
-  } else {
-    $ENV{'PANDA_BUILD_TYPE'} = 'gmsvc';
-  }
-
-  $ENV{'PANDA_OPTIMIZE'}='2';
-
-  if($DEBUG_GENERATE_PYTHON_CODE_ONLY) {
-    &gen_python_code();
-    exit(0);
-  }
-
-  &buildall($INSTALLNUM);
-}
-
-if($do_install_dir[$RELEASENUM]) {
-  if($dir_build_type[$RELEASENUM]) {
-    $ENV{'PANDA_BUILD_TYPE'} = 'msvc';
-  } else {
-    $ENV{'PANDA_BUILD_TYPE'} = 'gmsvc';
-  }
-  $ENV{'PANDA_OPTIMIZE'}='3';
-
-  if($DEBUG_GENERATE_PYTHON_CODE_ONLY) {
-    &gen_python_code();
-    exit(0);
-  }
-
-  &buildall($RELEASENUM);
-}
-
-BEFORE_DBGBUILD:
-
-if($do_install_dir[$DEBUGNUM]) {
-    if($dir_build_type[$DEBUGNUM]) {
-      $ENV{'PANDA_BUILD_TYPE'} = 'msvc';
-     } else {
-       $ENV{'PANDA_BUILD_TYPE'} = 'gmsvc';
-     }
-    $ENV{'USE_BROWSEINFO'}='1';   # make .sbr files
-    if(! $DEBUG_GENERATE_PYTHON_CODE_ONLY) {
-       $ENV{'PANDA_OPTIMIZE'}='1';
-    }
-
-    if($DEBUG_GENERATE_PYTHON_CODE_ONLY) {
-      &gen_python_code();
-      exit(0);
-    }
-
-    &buildall($DEBUGNUM);
-    &make_bsc_file();
-    delete $ENV{'USE_BROWSEINFO'};
-
-    &myexecstr("del /s *.sbr","nomsg","DO_LOG","NT cmd");
-}
-
-AFTER_DBGBUILD:
-
-if($do_install_dir[$PUBLISHNUM]) {
-  if($dir_build_type[$PUBLISHNUM]) {
-    $ENV{'PANDA_BUILD_TYPE'} = 'msvc';
-  } else {
-    $ENV{'PANDA_BUILD_TYPE'} = 'gmsvc';
-  }
-  $ENV{'PANDA_OPTIMIZE'}='4';
-  &buildall($PUBLISHNUM);
-}
-
-
-&logmsg("*** Panda Build Log Finished at ".&gettimestr()." ***");
-
-# store log in 'debug' dir
-&myexecstr("copy ".$fulllogfilename_win." ".$inst_dirs[$g_last_dirnum], "copy of ".$fulllogfilename_win." failed!!", "","NT cmd");
-
-exit(0);
-
-# TODO:
-# compress old archived blds?
-# build DLLs with version stamp set by this script
-# implement build-specific opttype mode
-

+ 0 - 1849
pandatool/src/scripts/cvlog.pl

@@ -1,1849 +0,0 @@
-#!/bin/sh
-exec perl -w -x $0 ${1+"$@"} # -*- mode: perl; perl-indent-level: 2; -*-
-#!perl -w
-
-##############################################################
-###                                                        ###
-### cvs2cl.pl: produce ChangeLog(s) from `cvs log` output. ###
-###                                                        ###
-##############################################################
-
-## $Revision$
-## $Date$
-## $Author$
-##
-##   (C) 1999 Karl Fogel <[email protected]>, under the GNU GPL.
-## 
-##   (Extensively hacked on by Melissa O'Neill <[email protected]>.)
-##
-## cvs2cl.pl is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## cvs2cl.pl is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You may have received a copy of the GNU General Public License
-## along with cvs2cl.pl; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-
-
-
-use strict;
-use Text::Wrap;
-use Time::Local;
-use File::Basename;
-
-
-# The Plan:
-#
-# Read in the logs for multiple files, spit out a nice ChangeLog that
-# mirrors the information entered during `cvs commit'.
-#
-# The problem presents some challenges. In an ideal world, we could
-# detect files with the same author, log message, and checkin time --
-# each <filelist, author, time, logmessage> would be a changelog entry.
-# We'd sort them; and spit them out.  Unfortunately, CVS is *not atomic*
-# so checkins can span a range of times.  Also, the directory structure
-# could be hierarchical.
-#
-# Another question is whether we really want to have the ChangeLog
-# exactly reflect commits. An author could issue two related commits,
-# with different log entries, reflecting a single logical change to the
-# source. GNU style ChangeLogs group these under a single author/date.
-# We try to do the same.
-#
-# So, we parse the output of `cvs log', storing log messages in a
-# multilevel hash that stores the mapping:
-#   directory => author => time => message => filelist
-# As we go, we notice "nearby" commit times and store them together
-# (i.e., under the same timestamp), so they appear in the same log
-# entry.
-#
-# When we've read all the logs, we twist this mapping into
-# a time => author => message => filelist mapping for each directory.
-#
-# If we're not using the `--distributed' flag, the directory is always
-# considered to be `./', even as descend into subdirectories.
-
-
-############### Globals ################
-
-
-# What we run to generate it:
-my $Log_Source_Command = "cvs log";
-
-# In case we have to print it out:
-my $VERSION = '$Revision$';
-$VERSION =~ s/\S+\s+(\S+)\s+\S+/$1/;
-
-## Vars set by options:
-
-# Print debugging messages?
-my $Debug = 0;
-
-# Just show version and exit?
-my $Print_Version = 0;
-
-# Just print usage message and exit?
-my $Print_Usage = 0;
-
-# Single top-level ChangeLog, or one per subdirectory?
-my $Distributed = 0;
-
-# What file should we generate (defaults to "ChangeLog")?
-my $Log_File_Name = "ChangeLog";
-
-# Expand usernames to email addresses based on a map file?
-my $User_Map_File = "";
-
-# Only list this many file changes per dir
-my $Max_Fileline_Count = 15;
-
-# Only list changes with the last $Prev_Day_Count days
-my $Prev_Day_Count = 30;
-
-# Output to a file or to stdout?
-my $Output_To_Stdout = 1;
-
-# Eliminate empty log messages?
-my $Prune_Empty_Msgs = 0;
-
-# Don't call Text::Wrap on the body of the message
-my $No_Wrap = 1;
-
-# Separates header from log message.  Code assumes it is either " " or
-# "\n\n", so if there's ever an option to set it to something else,
-# make sure to go through all conditionals that use this var.
-my $After_Header = " ";
-
-# Format more for programs than for humans.
-my $XML_Output = 0;
-
-# Do some special tweaks for log data that was written in FSF
-# ChangeLog style.
-my $FSF_Style = 0;
-
-# Show times in UTC instead of local time
-my $UTC_Times = 0;
-
-# Show day of week in output?
-my $Show_Day_Of_Week = 1;
-
-# Show revision numbers in output?
-my $Show_Revisions = 1;
-
-# Show tags (symbolic names) in output?
-my $Show_Tags = 0;
-
-# Show branches by symbolic name in output?
-my $Show_Branches = 0;
-
-# Show only revisions on these branches or their ancestors.
-my @Follow_Branches;
-
-# Don't bother with files matching this regexp.
-my @Ignore_Files;
-
-# How exactly we match entries.  We definitely want "o",
-# and user might add "i" by using --case-insensitive option.
-my $Case_Insensitive = 0;
-
-# Maybe only show log messages matching a certain regular expression.
-my $Regexp_Gate = "";
-
-# Pass this global option string along to cvs, to the left of `log':
-my $Global_Opts = "";
-
-# Pass this option string along to the cvs log subcommand:
-my $Command_Opts = "";
-
-# Read log output from stdin instead of invoking cvs log?
-my $Input_From_Stdin = 0;
-
-# Don't show filenames in output.
-my $Hide_Filenames = 0;
-
-# Max checkin duration. CVS checkin is not atomic, so we may have checkin
-# times that span a range of time. We assume that checkins will last no
-# longer than $Max_Checkin_Duration seconds, and that similarly, no
-# checkins will happen from the same users with the same message less
-# than $Max_Checkin_Duration seconds apart.
-my $Max_Checkin_Duration = 300;
-
-# What to put at the front of [each] ChangeLog.  
-my $ChangeLog_Header = "";
-
-## end vars set by options.
-
-# In 'cvs log' output, one long unbroken line of equal signs separates
-# files:
-my $file_separator = "======================================="
-                   . "======================================";
-
-# In 'cvs log' output, a shorter line of dashes separates log messages
-# within a file:
-my $logmsg_separator = "----------------------------";
-
-my @monthlengtharr=(31,28,31,30,31,30,31,31,30,31,30,31);
-
-############### End globals ############
-
-
-&parse_options ();
-&derive_change_log ();
-
-
-### Everything below is subroutine definitions. ###
-
-# Fills up a ChangeLog structure in the current directory.
-sub derive_change_log ()
-{
-  # See "The Plan" above for a full explanation.
-  
-  my %grand_poobah;
-
-  my $file_full_path;
-  my $time;
-  my $revision;
-  my $author;
-  my $msg_txt;
-  my $detected_file_separator;
-
-  # We might be expanding usernames
-  my %usermap;
-
-  # In general, it's probably not very maintainable to use state
-  # variables like this to tell the loop what it's doing at any given
-  # moment, but this is only the first one, and if we never have more
-  # than a few of these, it's okay.
-  my $collecting_symbolic_names = 0;
-  my %symbolic_names;    # Where tag names get stored.
-  my %branch_names;      # We'll grab branch names while we're at it.
-  my %branch_numbers;    # Save some revisions for @Follow_Branches
-  my @branch_roots;      # For showing which files are branch ancestors.
-
-  # Bleargh.  Compensate for a deficiency of custom wrapping.
-  if (($After_Header ne " ") and $FSF_Style)
-  {
-    $After_Header .= "\t";
-  }
-       
-  my ($ign1,$ign2,$ign3,$dayofmonth,$month,$year_,$ign4) = $UTC_Times ? gmtime(time()) : localtime(time());
-
-  my $logdayofmonth;
-  my $logmonth;
-  my $logyear;
-
-  my $datestr= &FindPrevDayStr($Prev_Day_Count,$dayofmonth,$month,$year_);
-  $Log_Source_Command =~ s/(cvs log)/cvs log -d \">$datestr\"/;
-
-  if (! $Input_From_Stdin) {
-    open (LOG_SOURCE, "$Log_Source_Command |")
-        or die "unable to run \"${Log_Source_Command}\"";
-  }
-  else {
-    open (LOG_SOURCE, "-") or die "unable to open stdin for reading";
-  }
-
-  %usermap = &maybe_read_user_map_file ();
-
-  while (<LOG_SOURCE>)
-  {
-    # If on a new file and don't see filename, skip until we find it, and
-    # when we find it, grab it.
-    if ((! (defined $file_full_path)) and /^Working file: (.*)/) 
-    {
-      $file_full_path = $1;
-      if (@Ignore_Files) 
-      {
-        my $base;
-        ($base, undef, undef) = fileparse ($file_full_path);
-        # Ouch, I wish trailing operators in regexps could be
-        # evaluated on the fly!
-        if ($Case_Insensitive) {
-          if (grep ($file_full_path =~ m|$_|i, @Ignore_Files)) {
-            undef $file_full_path;
-          }
-        }
-        elsif (grep ($file_full_path =~ m|$_|, @Ignore_Files)) {
-          undef $file_full_path;
-        }
-      }
-      next;
-    }
-
-    # Just spin wheels if no file defined yet.
-    next if (! $file_full_path);
-
-    # Collect tag names in case we're asked to print them in the output.
-    if (/^symbolic names:$/) {
-      $collecting_symbolic_names = 1;
-      next;  # There's no more info on this line, so skip to next
-    }
-    if ($collecting_symbolic_names)
-    {
-      # All tag names are listed with whitespace in front in cvs log
-      # output; so if see non-whitespace, then we're done collecting.
-      if (/^\S/) {
-        $collecting_symbolic_names = 0;
-      }
-      else    # we're looking at a tag name, so parse & store it
-      {
-        # According to the Cederqvist manual, in node "Tags", tag
-        # names must start with an uppercase or lowercase letter and
-        # can contain uppercase and lowercase letters, digits, `-',
-        # and `_'.  However, it's not our place to enforce that, so
-        # we'll allow anything CVS hands us to be a tag:
-        /^\s+([^:]+): ([\d.]+)$/;
-        my $tag_name = $1;
-        my $tag_rev  = $2;
-
-        # A branch number either has an odd number of digit sections
-        # (and hence an even number of dots), or has ".0." as the
-        # second-to-last digit section.  Test for these conditions.
-        my $real_branch_rev = "";
-        if (($tag_rev =~ /^(\d+\.\d+\.)+\d+$/)   # Even number of dots...
-            and (! ($tag_rev =~ /^(1\.)+1$/)))   # ...but not "1.[1.]1"
-        {
-          $real_branch_rev = $tag_rev;
-        }
-        elsif ($tag_rev =~ /(\d+\.(\d+\.)+)0.(\d+)/)  # Has ".0."
-        {
-          $real_branch_rev = $1 . $3;
-        }
-        # If we got a branch, record its number.
-        if ($real_branch_rev)
-        {
-          $branch_names{$real_branch_rev} = $tag_name;
-          if (@Follow_Branches) {
-            if (grep ($_ eq $tag_name, @Follow_Branches)) {
-              $branch_numbers{$tag_name} = $real_branch_rev;
-            }
-          }
-        }
-        else {
-          # Else it's just a regular (non-branch) tag.
-          push (@{$symbolic_names{$tag_rev}}, $tag_name);
-        }
-      }
-    }
-    # End of code for collecting tag names.
-
-    # If have file name, but not revision, and see revision, then grab
-    # it.  (We collect unconditionally, even though we may or may not
-    # ever use it.)
-    if ((! (defined $revision)) and (/^revision (\d+\.[\d.]+)/))
-    {
-      $revision = $1;
-
-      if (@Follow_Branches)
-      {
-        foreach my $branch (@Follow_Branches) 
-        {
-          # Special case for following trunk revisions
-          if (($branch =~ /^trunk$/i) and ($revision =~ /^[0-9]+\.[0-9]+$/))
-          {
-            goto dengo;
-          }
-
-          my $branch_number = $branch_numbers{$branch};
-          if ($branch_number) 
-          {
-            # Are we on one of the follow branches or an ancestor of
-            # same?
-            #
-            # If this revision is a prefix of the branch number, or
-            # possibly is less in the minormost number, OR if this
-            # branch number is a prefix of the revision, then yes.
-            # Otherwise, no.
-            #
-            # So below, we determine if any of those conditions are
-            # met.
-            
-            # Trivial case: is this revision on the branch?
-            # (Compare this way to avoid regexps that screw up Emacs
-            # indentation, argh.)
-            if ((substr ($revision, 0, ((length ($branch_number)) + 1)))
-                eq ($branch_number . "."))
-            {
-              goto dengo;
-            }
-            # Non-trivial case: check if rev is ancestral to branch
-            elsif ((length ($branch_number)) > (length ($revision)))
-            {
-              $revision =~ /^((?:\d+\.)+)(\d+)$/;
-              my $r_left = $1;          # still has the trailing "."
-              my $r_end = $2;
-              
-              $branch_number =~ /^((?:\d+\.)+)(\d+)\.\d+$/;
-              my $b_left = $1;  # still has trailing "."
-              my $b_mid  = $2;   # has no trailing "."
-
-              if (($r_left eq $b_left)
-                  && ($r_end <= $b_mid))
-              {
-                goto dengo;
-              }
-            }
-          }
-        }
-      }
-      else    # (! @Follow_Branches)
-      {
-        next;
-      }
-
-      # Else we are following branches, but this revision isn't on the
-      # path.  So skip it.
-      undef $revision;
-    dengo:
-      next;
-    }
-    
-    # If we don't have a revision right now, we couldn't possibly
-    # be looking at anything useful. 
-    if (! (defined ($revision))) {
-      $detected_file_separator = /^$file_separator$/o;
-      if ($detected_file_separator) {
-        # No revisions for this file; can happen, e.g. "cvs log -d DATE"
-        goto CLEAR;
-      }
-      else {
-        next;
-      }
-    }
-
-    # If have file name but not date and author, and see date or
-    # author, then grab them:
-    unless (defined $time) 
-    {
-      if (/^date: .*/)
-      {
-        ($time, $author) = &parse_date_and_author ($_);
-        if (defined ($usermap{$author}) and $usermap{$author}) {
-          $author = $usermap{$author};
-        }
-      }
-      else {
-        $detected_file_separator = /^$file_separator$/o;
-        if ($detected_file_separator) {
-          # No revisions for this file; can happen, e.g. "cvs log -d DATE"
-          goto CLEAR;
-        }
-      }
-      # If the date/time/author hasn't been found yet, we couldn't
-      # possibly care about anything we see.  So skip:
-      next;
-    }
-
-    # A "branches: ..." line here indicates that one or more branches
-    # are rooted at this revision.  If we're showing branches, then we
-    # want to show that fact as well, so we collect all the branches
-    # that this is the latest ancestor of and store them in
-    # @branch_roots.  Just for reference, the format of the line we're
-    # seeing at this point is:
-    #
-    #    branches:  1.5.2;  1.5.4;  ...;
-    #
-    # Okay, here goes:
-
-    if (/^branches:\s+(.*);$/)
-    {
-      if ($Show_Branches)
-      {
-        my $lst = $1;
-        $lst =~ s/(1\.)+1;|(1\.)+1$//;  # ignore the trivial branch 1.1.1
-        if ($lst) {
-          @branch_roots = split (/;\s+/, $lst);
-        }
-        else {
-          undef @branch_roots;
-        }
-        next;
-      }
-      else
-      {
-        # Ugh.  This really bothers me.  Suppose we see a log entry
-        # like this:
-        #
-        #    ----------------------------
-        #    revision 1.1
-        #    date: 1999/10/17 03:07:38;  author: jrandom;  state: Exp;
-        #    branches:  1.1.2;
-        #    Intended first line of log message begins here.
-        #    ----------------------------
-        #
-        # The question is, how we can tell the difference between that
-        # log message and a *two*-line log message whose first line is
-        # 
-        #    "branches:  1.1.2;"
-        #
-        # See the problem?  The output of "cvs log" is inherently
-        # ambiguous.
-        #
-        # For now, we punt: we liberally assume that people don't
-        # write log messages like that, and just toss a "branches:"
-        # line if we see it but are not showing branches.  I hope no
-        # one ever loses real log data because of this.
-        next;
-      }
-    }
-
-    # If have file name, time, and author, then we're just grabbing
-    # log message texts:
-    $detected_file_separator = /^$file_separator$/o;
-    if ($detected_file_separator && ! (defined $revision)) {
-      # No revisions for this file; can happen, e.g. "cvs log -d DATE"
-      goto CLEAR;
-    }
-    unless ($detected_file_separator || /^$logmsg_separator$/o)
-    {
-      $msg_txt .= $_;   # Normally, just accumulate the message...
-      next;
-    }
-    # ... until a msg separator is encountered:
-    # Ensure the message contains something:
-    if ((! $msg_txt)
-        || ($msg_txt =~ /^\s*\.\s*$|^\s*$/)
-        || ($msg_txt =~ /\*\*\* empty log message \*\*\*/)) 
-    {
-      if ($Prune_Empty_Msgs) {
-        goto CLEAR;
-      }
-      # else
-      $msg_txt = "[no log message]\n";
-    }
-
-    ### Store it all in the Grand Poobah:
-    {
-      my $dir_key;        # key into %grand_poobah
-      my %qunk;           # complicated little jobbie, see below
-
-      # Each revision of a file has a little data structure (a `qunk') 
-      # associated with it.  That data structure holds not only the
-      # file's name, but any additional information about the file
-      # that might be needed in the output, such as the revision
-      # number, tags, branches, etc.  The reason to have these things
-      # arranged in a data structure, instead of just appending them
-      # textually to the file's name, is that we may want to do a
-      # little rearranging later as we write the output.  For example,
-      # all the files on a given tag/branch will go together, followed
-      # by the tag in parentheses (so trunk or otherwise non-tagged
-      # files would go at the end of the file list for a given log
-      # message).  This rearrangement is a lot easier to do if we
-      # don't have to reparse the text.
-      #
-      # A qunk looks like this:
-      #
-      #   { 
-      #     filename    =>    "hello.c",
-      #     revision    =>    "1.4.3.2",
-      #     time        =>    a timegm() return value (moment of commit)
-      #     tags        =>    [ "tag1", "tag2", ... ],
-      #     branch      =>    "branchname" # There should be only one, right?
-      #     branchroots =>    [ "branchtag1", "branchtag2", ... ]
-      #   }
-
-      if ($Distributed) {
-        # Just the basename, don't include the path.
-        ($qunk{'filename'}, $dir_key, undef) = fileparse ($file_full_path);
-      }
-      else {
-        $dir_key = "./";
-        $qunk{'filename'} = $file_full_path;
-      }
-
-      # This may someday be used in a more sophisticated calculation
-      # of what other files are involved in this commit.  For now, we
-      # don't use it, because the common-commit-detection algorithm is
-      # hypothesized to be "good enough" as it stands.
-      $qunk{'time'} = $time;
-
-      # We might be including revision numbers and/or tags and/or
-      # branch names in the output.  Most of the code from here to
-      # loop-end deals with organizing these in qunk.
-
-      $qunk{'revision'} = $revision;
-
-      # Grab the branch, even though we may or may not need it:
-      $qunk{'revision'} =~ /((?:\d+\.)+)\d+/;
-      my $branch_prefix = $1;
-      $branch_prefix =~ s/\.$//;  # strip off final dot
-      if ($branch_names{$branch_prefix}) {
-        $qunk{'branch'} = $branch_names{$branch_prefix};
-      }
-
-      # If there's anything in the @branch_roots array, then this
-      # revision is the root of at least one branch.  We'll display
-      # them as branch names instead of revision numbers, the
-      # substitution for which is done directly in the array:
-      if (@branch_roots) {
-        my @roots = map { $branch_names{$_} } @branch_roots;
-        $qunk{'branchroots'} = \@roots;
-      }
-
-      # Save tags too.
-      if (defined ($symbolic_names{$revision})) {
-        $qunk{'tags'} = $symbolic_names{$revision};
-        delete $symbolic_names{$revision};
-      }
-
-      # Add this file to the list
-      # (We use many spoonfuls of autovivication magic. Hashes and arrays
-      # will spring into existence if they aren't there already.)
-
-      &debug ("(pushing log msg for ${dir_key}$qunk{'filename'})\n");
-
-      # Store with the files in this commit.  Later we'll loop through
-      # again, making sure that revisions with the same log message
-      # and nearby commit times are grouped together as one commit.
-      push (@{$grand_poobah{$dir_key}{$author}{$time}{$msg_txt}}, \%qunk);
-    }
-
-  CLEAR:
-    # Make way for the next message
-    undef $msg_txt;
-    undef $time;
-    undef $revision;
-    undef $author;
-    undef @branch_roots;
-
-    # Maybe even make way for the next file:
-    if ($detected_file_separator) {
-      undef $file_full_path;
-      undef %branch_names;
-      undef %branch_numbers;
-    }
-  }
-
-  close (LOG_SOURCE);
-
-  ### Process each ChangeLog
-
-  while (my ($dir,$authorhash) = each %grand_poobah)
-  {
-    &debug ("DOING DIR: $dir\n");
-
-    # Here we twist our hash around, from being
-    #   author => time => message => filelist
-    # in %$authorhash to
-    #   time => author => message => filelist
-    # in %changelog.  
-    #
-    # This is also where we merge entries.  The algorithm proceeds
-    # through the timeline of the changelog with a sliding window of
-    # $Max_Checkin_Duration seconds; within that window, entries that
-    # have the same log message are merged.
-    #
-    # (To save space, we zap %$authorhash after we've copied
-    # everything out of it.) 
-
-    my %changelog;
-    while (my ($author,$timehash) = each %$authorhash)
-    {
-      my $lasttime;
-      my %stamptime;
-      foreach my $time (sort {$main::a <=> $main::b} (keys %$timehash))
-      {
-        my $msghash = $timehash->{$time};
-        while (my ($msg,$qunklist) = each %$msghash)
-        {
-      my $stamptime = $stamptime{$msg};
-          if ((defined $stamptime)
-              and (($time - $stamptime) < $Max_Checkin_Duration)
-              and (defined $changelog{$stamptime}{$author}{$msg}))
-          {
-        push(@{$changelog{$stamptime}{$author}{$msg}}, @$qunklist);
-          }
-          else {
-            $changelog{$time}{$author}{$msg} = $qunklist;
-            $stamptime{$msg} = $time;
-          }
-        }
-      }
-    }
-    undef (%$authorhash);
-
-    ### Now we can write out the ChangeLog!
-
-    my ($logfile_here, $logfile_bak, $tmpfile);
-
-    if (! $Output_To_Stdout) {
-      $logfile_here =  $dir . $Log_File_Name;
-      $logfile_here =~ s/^\.\/\//\//;   # fix any leading ".//" problem
-      $tmpfile      = "${logfile_here}.cvs2cl$$.tmp";
-      $logfile_bak  = "${logfile_here}.bak";
-
-      open (LOG_OUT, ">$tmpfile") or die "Unable to open \"$tmpfile\"";
-    }
-    else {
-      open (LOG_OUT, ">-") or die "Unable to open stdout for writing";
-    }
-
-    print LOG_OUT $ChangeLog_Header;
-
-    if ($XML_Output) {
-      print LOG_OUT "<?xml version=\"1.0\"?>\n\n"
-          . "<changelog xmlns=\"http://www.red-bean.com/xmlns/cvs2cl/\">\n\n";
-    }
-
- 
-#    my $printed_fileline_count_left = 4;
-#    my $breakoutofloop = 0;
-
-    foreach my $time (sort {$main::b <=> $main::a} (keys %changelog))
-    {
-       my $printed_fileline_count_left = $Max_Fileline_Count;
-#      if($breakoutofloop) {
-#          last;
-#      }
-      my $authorhash = $changelog{$time};
-      while (my ($author,$mesghash) = each %$authorhash)
-      {
-        # If XML, escape in outer loop to avoid compound quoting:
-        if ($XML_Output) {
-          $author = &xml_escape ($author);
-        }
-
-        while (my ($msg,$qunklist) = each %$mesghash)
-        {
-          my $files               = &pretty_file_list ($qunklist);
-          my $header_line;          # date and author
-          my $body;                 # see below
-          my $wholething;           # $header_line + $body
-
-          # Set up the date/author line.
-          # kff todo: do some more XML munging here, on the header
-          # part of the entry:
-          my ($ignore,$min,$hour,$mday,$mon,$year,$wday)
-              = $UTC_Times ? gmtime($time) : localtime($time);
-
-          # XML output includes everything else, we might as well make
-          # it always include Day Of Week too, for consistency.
-          if ($Show_Day_Of_Week or $XML_Output) {
-            $wday = ("Sunday", "Monday", "Tuesday", "Wednesday",
-                     "Thursday", "Friday", "Saturday")[$wday];
-            $wday = ($XML_Output) ? "<weekday>${wday}</weekday>\n" : " $wday";
-          }
-          else {
-            $wday = "";
-          }
-
-          if ($XML_Output) {
-            $header_line = 
-                sprintf ("<date>%4u-%02u-%02u</date>\n"
-                         . "${wday}"
-                         . "<time>%02u:%02u</time>\n"
-                         . "<author>%s</author>\n",
-                         $year+1900, $mon+1, $mday, $hour, $min, $author);
-          }
-          else {
-            $header_line = 
-                sprintf ("%4u-%02u-%02u${wday} %02u:%02u  %s\n",
-                         $year+1900, $mon+1, $mday, $hour, $min, $author);
-          }
-
-          # Reshape the body according to user preferences.
-          if ($XML_Output) 
-          {
-            $msg = &preprocess_msg_text ($msg);
-            $body = $files . $msg;
-          }
-          elsif ($No_Wrap) 
-          {
-            $msg = &preprocess_msg_text ($msg);
-###            $files = wrap ("\t", "   ", "$files");
-
-            my $dirprepended = ($files =~ /:,/);
-
-            if($dirprepended) {
-                $printed_fileline_count_left++;
-            }
-            # truncate to max fileline count
-            my @filearr = split(", ",$files,$printed_fileline_count_left+1);
-            $printed_fileline_count_left -= ($#filearr+1);            
-
-            if($printed_fileline_count_left<0) {
-                $filearr[$#filearr] = "";
-            }
-
-#            $breakoutofloop = ($printed_fileline_count_left<=0);
-
-            $files = join(", ",@filearr);
-
-            if($dirprepended) {
-              $files =~ s/, /,\n\t    /g;
-              $files =~ s/:,/:/;
-            } else {
-                $files =~ s/, /,\n\t  /g;
-            }
-            $files = "\t".$files;  # I like this better (Georges)
-            $msg =~ s/\n(.*)/\n\t$1/g;
-            unless ($After_Header eq " ") {
-              $msg =~ s/^(.*)/\t$1/g;
-            }
-            $body = $files . $After_Header . $msg;
-          }
-          else  # do wrapping, either FSF-style or regular
-          {
-            if ($FSF_Style)
-            {
-              $files = wrap ("\t", "        ", "$files");
-              
-              my $files_last_line_len = 0;
-              if ($After_Header eq " ")
-              {
-                $files_last_line_len = &last_line_len ($files);
-                $files_last_line_len += 1;  # for $After_Header
-              }
-              
-              $msg = &wrap_log_entry
-                  ($msg, "\t", 69 - $files_last_line_len, 69);
-              $body = $files . $After_Header . $msg;
-            }
-            else  # not FSF-style
-            {
-              $msg = &preprocess_msg_text ($msg);
-              $body = $files . $After_Header . $msg;
-              $body = wrap ("\t", "        ", "$body");
-            }
-          }
-
-          $wholething = $header_line . $body;
-
-          if ($XML_Output) {
-            $wholething = "<entry>\n${wholething}</entry>\n";
-          }
-
-          # One last check: make sure it passes the regexp test, if the
-          # user asked for that.  We have to do it here, so that the
-          # test can match against information in the header as well
-          # as in the text of the log message.
-
-          # How annoying to duplicate so much code just because I
-          # can't figure out a way to evaluate scalars on the trailing
-          # operator portion of a regular expression.  Grrr.
-          if ($Case_Insensitive) {
-            unless ($Regexp_Gate && ($wholething !~ /$Regexp_Gate/oi)) { 
-              print LOG_OUT "${wholething}\n";
-            }
-          }
-          else {
-            unless ($Regexp_Gate && ($wholething !~ /$Regexp_Gate/o)) { 
-              print LOG_OUT "${wholething}\n";
-            }
-          }
-        }
-      }
-    }
-
-    if ($XML_Output) {
-      print LOG_OUT "</changelog>\n";
-    }
-
-    close (LOG_OUT);
-
-    if (! $Output_To_Stdout) 
-    {
-      if (-f $logfile_here) {
-        rename ($logfile_here, $logfile_bak);
-      } 
-      rename ($tmpfile, $logfile_here);
-    }
-  }
-}
-
-
-sub parse_date_and_author ()
-{
-  # Parses the date/time and author out of a line like: 
-  #
-  # date: 1999/02/19 23:29:05;  author: apharris;  state: Exp;
-
-  my $line = shift;
-
-  my ($year, $mon, $mday, $hours, $min, $secs, $author) = $line =~
-      m#(\d+)/(\d+)/(\d+)\s+(\d+):(\d+):(\d+);\s+author:\s+([^;]+);#
-          or  die "Couldn't parse date ``$line''";
-  die "Bad date or Y2K issues" unless ($year > 1969 and $year < 2258);
-  # Kinda arbitrary, but useful as a sanity check
-  my $time = timegm($secs,$min,$hours,$mday,$mon-1,$year-1900);
-
-  return ($time, $author);
-}
-
-
-# Here we take a bunch of qunks and convert them into printed
-# summary that will include all the information the user asked for.
-sub pretty_file_list ()
-{
-  if ($Hide_Filenames and (! $XML_Output)) {
-    return "";
-  }
-
-  my $qunksref = shift;
-  my @qunkrefs = @$qunksref;
-  my @filenames;
-  my $beauty = "";          # The accumulating header string for this entry.
-  my %non_unanimous_tags;   # Tags found in a proper subset of qunks
-  my %unanimous_tags;       # Tags found in all qunks
-  my %all_branches;         # Branches found in any qunk
-  my $common_dir = undef;   # Dir prefix common to all files ("" if none)
-  my $fbegun = 0;           # Did we begin printing filenames yet?
-  
-  # First, loop over the qunks gathering all the tag/branch names.
-  # We'll put them all in non_unanimous_tags, and take out the
-  # unanimous ones later.
-  foreach my $qunkref (@qunkrefs) 
-  {
-    # Keep track of whether all the files in this commit were in the
-    # same directory, and memorize it if so.  We can make the output a
-    # little more compact by mentioning the directory only once.
-    if ((scalar (@qunkrefs)) > 1)
-    {
-      if (! (defined ($common_dir)))
-      {
-        my ($base, $dir);
-        ($base, $dir, undef) = fileparse ($$qunkref{'filename'});
-
-        if ((! (defined ($dir)))  # this first case is sheer paranoia
-            or ($dir eq "")
-            or ($dir eq "./")
-            or ($dir eq ".\\")) 
-        {
-          $common_dir = "";
-        }
-        else
-        {
-          $common_dir = $dir;
-        }
-      }
-      elsif ($common_dir ne "")
-      {
-        # Already have a common dir prefix, so how much of it can we preserve?
-        $common_dir = &common_path_prefix ($$qunkref{'filename'}, $common_dir);
-      }
-    }
-    else  # only one file in this entry anyway, so common dir not an issue
-    {
-      $common_dir = "";
-    }
-
-    if (defined ($$qunkref{'branch'})) {
-      $all_branches{$$qunkref{'branch'}} = 1;
-    }
-    if (defined ($$qunkref{'tags'})) {
-      foreach my $tag (@{$$qunkref{'tags'}}) {
-        $non_unanimous_tags{$tag} = 1;
-      }
-    }
-  }
-
-  # Any tag held by all qunks will be printed specially... but only if
-  # there are multiple qunks in the first place!
-  if ((scalar (@qunkrefs)) > 1) {
-    foreach my $tag (keys (%non_unanimous_tags)) {
-      my $everyone_has_this_tag = 1;
-      foreach my $qunkref (@qunkrefs) {
-        if ((! (defined ($$qunkref{'tags'})))
-            or (! (grep ($_ eq $tag, @{$$qunkref{'tags'}})))) {
-          $everyone_has_this_tag = 0;
-        }
-      }
-      if ($everyone_has_this_tag) {
-        $unanimous_tags{$tag} = 1;
-        delete $non_unanimous_tags{$tag};
-      }
-    }
-  }
-
-  if ($XML_Output)
-  {
-    # If outputting XML, then our task is pretty simple, because we
-    # don't have to detect common dir, common tags, branch prefixing,
-    # etc.  We just output exactly what we have, and don't worry about
-    # redundancy or readability.
-
-    foreach my $qunkref (@qunkrefs) 
-    {
-      my $filename    = $$qunkref{'filename'};
-      my $revision    = $$qunkref{'revision'};
-      my $tags        = $$qunkref{'tags'};
-      my $branch      = $$qunkref{'branch'};
-      my $branchroots = $$qunkref{'branchroots'};
-
-      $filename = &xml_escape ($filename);   # probably paranoia
-      $revision = &xml_escape ($revision);   # definitely paranoia
-
-      $beauty .= "<file>\n";
-      $beauty .= "<name>${filename}</name>\n";
-      $beauty .= "<revision>${revision}</revision>\n";
-      if ($branch) {
-        $branch   = &xml_escape ($branch);     # more paranoia
-        $beauty .= "<branch>${branch}</branch>\n";
-      }
-      foreach my $tag (@$tags) {
-        $tag = &xml_escape ($tag);  # by now you're used to the paranoia
-        $beauty .= "<tag>${tag}</tag>\n";
-      }
-      foreach my $root (@$branchroots) {
-        $root = &xml_escape ($root);  # which is good, because it will continue
-        $beauty .= "<branchroot>${root}</branchroot>\n";
-      }
-      $beauty .= "</file>\n";
-    }
-
-    # Theoretically, we could go home now.  But as long as we're here,
-    # let's print out the common_dir and utags, as a convenience to
-    # the receiver (after all, earlier code calculated that stuff
-    # anyway, so we might as well take advantage of it).
-
-    if ((scalar (keys (%unanimous_tags))) > 1) {
-      foreach my $utag ((keys (%unanimous_tags))) {
-        $utag = &xml_escape ($utag);   # the usual paranoia
-        $beauty .= "<utag>${utag}</utag>\n";
-      }
-    }
-
-    if ($common_dir) {
-      $common_dir = &xml_escape ($common_dir);
-      $beauty .= "<commondir>${common_dir}</commondir>\n";
-    }
-
-    # That's enough for XML, time to go home:
-    return $beauty;
-  }
-
-  # Else not XML output, so complexly compactify for chordate
-  # consumption.  At this point we have enough global information
-  # about all the qunks to organize them non-redundantly for output.
-
-  if ($common_dir) {
-    # Note that $common_dir still has its trailing slash
-#    $beauty .= "$common_dir: ";
-    $beauty .= "$common_dir:, ";
-  }
-
-  if ($Show_Branches)
-  {
-    # For trailing revision numbers.
-    my @brevisions;
-
-    foreach my $branch (keys (%all_branches))
-    {
-      foreach my $qunkref (@qunkrefs)
-      {
-        if ((defined ($$qunkref{'branch'}))
-            and ($$qunkref{'branch'} eq $branch))
-        {
-          if ($fbegun) {
-            # kff todo: comma-delimited in XML too?  Sure.
-            $beauty .= ", ";
-          } 
-          else {
-            $fbegun = 1;
-          }
-          my $fname = substr ($$qunkref{'filename'}, length ($common_dir));
-          $beauty .= $fname;
-          $$qunkref{'printed'} = 1;  # Just setting a mark bit, basically
-
-          if ($Show_Tags && (defined @{$$qunkref{'tags'}})) {
-            my @tags = grep ($non_unanimous_tags{$_}, @{$$qunkref{'tags'}});
-            if (@tags) {
-              $beauty .= " (tags: ";
-              $beauty .= join (', ', @tags);
-              $beauty .= ")";
-            }
-          }
-
-          if ($Show_Revisions) {
-            # Collect the revision numbers' last components, but don't
-            # print them -- they'll get printed with the branch name
-            # later.
-            $$qunkref{'revision'} =~ /.+\.([\d])+$/;
-            push (@brevisions, $1);
-
-            # todo: we're still collecting branch roots, but we're not
-            # showing them anywhere.  If we do show them, it would be
-            # nifty to just call them revision "0" on a the branch.
-            # Yeah, that's the ticket.
-          }
-        }
-      }
-      $beauty .= " ($branch";
-      if (@brevisions) {
-        if ((scalar (@brevisions)) > 1) {
-          $beauty .= ".[";
-          $beauty .= (join (',', @brevisions));
-          $beauty .= "]";
-        }
-        else {
-          $beauty .= ".$brevisions[0]";
-        }
-      }
-      $beauty .= ")";
-    }
-  }
-
-  # Okay; any qunks that were done according to branch are taken care
-  # of, and marked as printed.  Now print everyone else.
-  
-  foreach my $qunkref (@qunkrefs)
-  {
-    next if (defined ($$qunkref{'printed'}));   # skip if already printed
-        
-    if ($fbegun) {
-      $beauty .= ", ";
-    }
-    else {
-      $fbegun = 1;
-    }
-    $beauty .= substr ($$qunkref{'filename'}, length ($common_dir));
-    # todo: Shlomo's change was this:
-    # $beauty .= substr ($$qunkref{'filename'}, 
-    #              (($common_dir eq "./") ? "" : length ($common_dir)));
-    $$qunkref{'printed'} = 1;  # Set a mark bit.
-    
-    if ($Show_Revisions || $Show_Tags)
-    {
-      my $started_addendum = 0;
-
-      if ($Show_Revisions) {
-        $started_addendum = 1;
-        $beauty .= " (";
-        $beauty .= "$$qunkref{'revision'}";
-      }
-      if ($Show_Tags && (defined $$qunkref{'tags'})) {
-        my @tags = grep ($non_unanimous_tags{$_}, @{$$qunkref{'tags'}});
-        if ((scalar (@tags)) > 0) {
-          if ($started_addendum) {
-            $beauty .= ", ";
-          }
-          else {
-            $beauty .= " (tags: ";
-          }
-          $beauty .= join (', ', @tags);
-          $started_addendum = 1;
-        }
-      }
-      if ($started_addendum) {
-        $beauty .= ")";
-      }
-    }
-  }
-
-  # Unanimous tags always come last.
-  if ($Show_Tags && %unanimous_tags)
-  {
-    $beauty .= " (utags: ";
-    $beauty .= join (', ', keys (%unanimous_tags));
-    $beauty .= ")";
-  }
-
-  # todo: still have to take care of branch_roots?
-
-  $beauty = "* $beauty:";
-
-  return $beauty;
-}
-
-
-sub common_path_prefix ()
-{
-  my $path1 = shift;
-  my $path2 = shift;
-
-  my ($dir1, $dir2);
-  (undef, $dir1, undef) = fileparse ($path1);
-  (undef, $dir2, undef) = fileparse ($path2);
-
-  # Transmogrify Windows filenames to look like Unix.  
-  # (It is far more likely that someone is running cvs2cl.pl under
-  # Windows than that they would genuinely have backslashes in their
-  # filenames.)
-  $dir1 =~ tr#\\#/#;
-  $dir2 =~ tr#\\#/#;
-
-  my $accum1 = "";
-  my $accum2 = "";
-  my $last_common_prefix = "";
-
-  while ($accum1 eq $accum2)
-  {
-    $last_common_prefix = $accum1;
-    last if ($accum1 eq $dir1);
-    my ($tmp1) = split (/\//, (substr ($dir1, length ($accum1))));
-    my ($tmp2) = split (/\//, (substr ($dir2, length ($accum2))));
-    $accum1 .= "$tmp1/" if ((defined ($tmp1)) and $tmp1);
-    $accum2 .= "$tmp2/" if ((defined ($tmp2)) and $tmp2);
-  }
-
-  return $last_common_prefix;
-}
-
-
-sub preprocess_msg_text ()
-{
-  my $text = shift;
-
-  # Strip out carriage returns (as they probably result from DOSsy editors).
-  $text =~ s/\r\n/\n/g;
-
-  # If it *looks* like two newlines, make it *be* two newlines:
-  $text =~ s/\n\s*\n/\n\n/g;
-
-  if ($XML_Output)
-  {
-    $text = &xml_escape ($text);
-    $text = "<msg>${text}</msg>\n";
-  }
-  elsif (! $No_Wrap)
-  {
-    # Strip off lone newlines, but only for lines that don't begin with
-    # whitespace or a mail-quoting character, since we want to preserve
-    # that kind of formatting.  Also don't strip newlines that follow a
-    # period; we handle those specially next.  And don't strip
-    # newlines that precede an open paren.
-    1 while ($text =~ s/(^|\n)([^>\s].*[^.\n])\n([^>\n])/$1$2 $3/g);
-    
-    # If a newline follows a period, make sure that when we bring up the
-    # bottom sentence, it begins with two spaces. 
-    1 while ($text =~ s/(^|\n)([^>\s].*)\n([^>\n])/$1$2  $3/g);
-  }
-
-  return $text;
-}
-
-
-sub last_line_len ()
-{
-  my $files_list = shift;
-  my @lines = split (/\n/, $files_list);
-  my $last_line = pop (@lines);
-  return length ($last_line);
-}
-
-sub FindPrevDayStr() {
- my($prevdays,$dayofmonth,$month,$year) = @_;
- use integer;
-
- $dayofmonth--;  # make this zero-based
-
- #doesnt account for leap years well, but good enuff
-
- my $totalyeardays=365; 
- if($year % 4 == 0) { 
-    $totalyeardays++;
-    $monthlengtharr[1]=29;
- }
- 
- my $prevyeardays = $prevdays % $totalyeardays;
- my $yearsback = $prevdays / 365;
-
- my $m=0;
- my $yearday = 0;
- while($m<$month) {
-     $yearday+=$monthlengtharr[$m];
-     $m++;
- }
-
- $yearday+=$dayofmonth;
- $yearday-=$prevyeardays;
-
- if($yearday<0) {
-     $yearsback++;
-     $yearday+=$totalyeardays;
- }
-
- $year -= $yearsback;   # also doesnt go lower than year 0
-
- $m=0;
- while($yearday>=$monthlengtharr[$m]) {
-     $yearday-=$monthlengtharr[$m];
-     $m++;
- }
-
- # mon/day are 0-based, conv to 1-based
- my $retstr=($year+1900)."-".($m+1)."-".($yearday+1);
- return $retstr;
-}
-
-# A custom wrap function, sensitive to some common constructs used in
-# log entries.
-sub wrap_log_entry ()
-{
-  my $text = shift;                # The text to wrap.
-  my $left_pad_str = shift;        # String to pad with on the left.
-
-  # These do NOT take left_pad_str into account:
-  my $length_remaining = shift;    # Amount left on current line.
-  my $max_line_length  = shift;    # Amount left for a blank line.
-
-  my $wrapped_text = "";           # The accumulating wrapped entry.
-  my $indentation = "";            # Inherited indentation from prev line.
-
-  my $first_time = 1;              # Is this the first iteration of the loop?
-
-  my @lines = split (/\n/, $text);
-  while (@lines)   # Don't use `foreach' here, it won't work.
-  {
-    my $this_line = shift (@lines);
-    chomp $this_line;
-
-    # First, if it matches any of the line-start regexps, then print a
-    # newline now...
-    if (($this_line =~ /^(\s*)\*\s+[a-zA-Z0-9]/)
-        || ($this_line =~ /^(\s*)\* [a-zA-Z0-9_\.\/\+-]+/)
-        || ($this_line =~ /^(\s*)\([a-zA-Z0-9_\.\/\+-]+(\)|,\s*)/)
-        || ($this_line =~ /^(\s*)- +/)
-        || ($this_line =~ /^(\s*)[^\s]+:\s*$/)
-        || ($this_line =~ /^(\s*)\*\) +/)
-        || ($this_line =~ /^(\s*)[a-zA-Z0-9](\)|\.|\:) +/))
-    {
-      # Make a line break immediately, unless header separator is set
-      # and this line is the first line in the entry, in which case
-      # we're getting the blank line for free already and shouldn't
-      # add an extra one.
-      unless (($After_Header ne " ") and ($first_time)) {
-        $wrapped_text .= "\n${left_pad_str}";
-      }
-      
-      $indentation = $1;
-      $length_remaining = $max_line_length - (length ($indentation));
-    }
-
-    # Now that any indentation has been preserved, strip off leading
-    # whitespace, so up-folding has no ugly side-effects.
-    $this_line =~ s/^\s*//;
-
-    # Accumulate the line, and adjust parameters for next line.
-    my $this_len = length ($this_line);
-    if ($this_len == 0)
-    {
-      # Blank lines should be preserved, and should cancel any
-      # indentation level.
-      $this_line = "\n${left_pad_str}";
-      $indentation = "";
-      $length_remaining = $max_line_length;
-    }
-    elsif ($this_len >= $length_remaining)
-    {
-      # Walk backwards from the end.  At first acceptable spot, break
-      # a new line.
-      my $idx = $length_remaining - 1;
-      if ($idx < 0) { $idx = 0 };
-      while ($idx > 0)
-      {
-        if (substr ($this_line, $idx, 1) =~ /\s/)
-        {
-          my $line_now = substr ($this_line, 0, $idx);
-          my $next_line = substr ($this_line, $idx);
-          $this_line = $line_now;
-          
-          # Clean whitespace off the end.
-          chomp $this_line;
-
-          # The current line is ready to be printed.
-          $this_line .= "\n${left_pad_str}";
-
-          # Make sure the next line is allowed full room.
-          $length_remaining = $max_line_length - (length ($indentation));
-
-          # Strip next_line, but then preserve any indentation.
-          $next_line =~ s/^\s*//;
-          $next_line = $indentation . $next_line;
-
-          unshift (@lines, $next_line);
-          last;
-        }
-        else
-        {
-          $idx--;
-        }
-      }
-
-      # If we just bottomed out, the line is too long, so just break
-      # it where the original text does.
-      if ($idx == 0)
-      {
-        if ($length_remaining == ($max_line_length - (length ($indentation))))
-        {
-          # The line is simply too long -- there is no hope of ever
-          # breaking it nicely, so just insert it verbatim, with
-          # appropriate padding.
-          $this_line = "\n${left_pad_str}${this_line}";
-        }
-        else
-        {
-          # Can't break it here, but may be able to on the next round.
-          unshift (@lines, $this_line);
-          $length_remaining = $max_line_length - (length ($indentation));
-          $this_line = "\n${left_pad_str}";
-        }
-      }
-    }
-    else  # $this_len < $length_remaining, so tack on what we can.
-    {
-      # Leave a note for the next iteration.
-      $length_remaining = $length_remaining - $this_len;
-
-      if ($this_line =~ /\.$/)
-      {
-        $this_line .= "  ";
-        $length_remaining -= 2;
-      }
-      else  # not a sentence end
-      {
-        $this_line .= " ";
-        $length_remaining -= 1;
-      }
-    }
-
-    # Unconditionally indicate that loop has run at least once.
-    $first_time = 0;
-
-    $wrapped_text .= "${this_line}";
-  }
-
-  # One last bit of padding.
-  $wrapped_text .= "\n";
-
-  return $wrapped_text;
-}
-
-
-sub xml_escape ()
-{
-  my $txt = shift;
-  $txt =~ s/&/&amp;/g;
-  $txt =~ s/</&lt;/g;
-  $txt =~ s/>/&gt;/g;
-  return $txt;
-}
-
-
-sub maybe_read_user_map_file ()
-{
-  my %expansions;
-
-  if ($User_Map_File)
-  {
-    open (MAPFILE, "<$User_Map_File")
-        or die ("Unable to open $User_Map_File ($!)");
-
-    while (<MAPFILE>) 
-    {
-      next if /^\s*#/;  # Skip comment lines.
-      next if not /:/;  # Skip lines without colons.
-
-      # It is now safe to split on ':'.
-      my ($username, $expansion) = split ':';
-      chomp $expansion;
-      $expansion =~ s/^'(.*)'$/$1/;
-      $expansion =~ s/^"(.*)"$/$1/;
-
-      # If it looks like the expansion has a real name already, then
-      # we toss the username we got from CVS log.  Otherwise, keep
-      # it to use in combination with the email address.
-
-      if ($expansion =~ /^\s*<{0,1}\S+@.*/) {
-        # Also, add angle brackets if none present
-        if (! ($expansion =~ /<\S+@\S+>/)) {
-          $expansions{$username} = "$username <$expansion>";
-        }
-        else {
-          $expansions{$username} = "$username $expansion";
-        }
-      }
-      else {
-        $expansions{$username} = $expansion;
-      }
-    }
-
-    close (MAPFILE);
-  }
-
-  return %expansions;
-}
-
-
-sub parse_options ()
-{
-  # Check this internally before setting the global variable.
-  my $output_file;
-
-  # If this gets set, we encountered unknown options and will exit at
-  # the end of this subroutine.
-  my $exit_with_admonishment = 0;
-
-  while (my $arg = shift (@ARGV)) 
-  {
-    if ($arg =~ /^-h$|^-help$|^--help$|^--usage$|^-?$/) {
-      $Print_Usage = 1;
-    }
-    elsif ($arg =~ /^--debug$/) {        # unadvertised option, heh
-      $Debug = 1;
-    }
-    elsif ($arg =~ /^--version$/) {
-      $Print_Version = 1;
-    }
-    elsif ($arg =~ /^-g$|^--global-opts$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      # Don't assume CVS is called "cvs" on the user's system:
-      $Log_Source_Command =~ s/(^\S*)/$1 $narg/;
-    }
-    elsif ($arg =~ /^-l$|^--log-opts$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $Log_Source_Command .= " $narg";
-    }
-    elsif ($arg =~ /^-f$|^--file$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $output_file = $narg;
-    }
-    elsif ($arg =~ /^--fsf$/) {
-      $FSF_Style = 1;
-    }
-    elsif ($arg =~ /^-U$|^--usermap$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $User_Map_File = $narg;
-    }
-    elsif ($arg =~ /^-W$|^--window$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $Max_Checkin_Duration = $narg;
-    }
-    elsif ($arg =~ /^-I$|^--ignore$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      push (@Ignore_Files, $narg);
-    }
-    elsif ($arg =~ /^-C$|^--case-insensitive$/) {
-      $Case_Insensitive = 1;
-    }
-    elsif ($arg =~ /^-R$|^--regexp$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $Regexp_Gate = $narg;
-    }
-    elsif ($arg =~ /^--stdout$/) {
-      $Output_To_Stdout = not $Output_To_Stdout;
-    }
-    elsif ($arg =~ /^--version$/) {
-      $Print_Version = 1;
-    }
-    elsif ($arg =~ /^--distributed$/) {
-      $Distributed = 1;
-    }
-    elsif ($arg =~ /^-P$|^--prune$/) {
-      $Prune_Empty_Msgs = 1;
-    }
-    elsif ($arg =~ /^-S$|^--separate-header$/) {
-      $After_Header = "\n\n";
-    }
-    elsif ($arg =~ /^--no-wrap$/) {
-      $No_Wrap = not $No_Wrap;
-    }
-    elsif ($arg =~ /^--gmt$|^--utc$/) {
-      $UTC_Times = 1;
-    }
-    elsif ($arg =~ /^-w$|^--day-of-week$/) {
-      $Show_Day_Of_Week = not $Show_Day_Of_Week;
-    }
-    elsif ($arg =~ /^-r$|^--revisions$/) {
-      $Show_Revisions = not $Show_Revisions;
-    }
-    elsif ($arg =~ /^-t$|^--tags$/) {
-      $Show_Tags = not $Show_Tags;
-    }
-    elsif ($arg =~ /^-b$|^--branches$/) {
-      $Show_Branches = not $Show_Branches;
-    }
-    elsif ($arg =~ /^-c$|^--count$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $Max_Fileline_Count = $narg;
-    }
-    elsif ($arg =~ /^-d$|^--days$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $Prev_Day_Count = $narg;
-    }
-    elsif ($arg =~ /^-F$|^--follow$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      push (@Follow_Branches, $narg);
-    }
-    elsif ($arg =~ /^--stdin$/) {
-      $Input_From_Stdin = 1;
-    }
-    elsif ($arg =~ /^--header$/) {
-      my $narg = shift (@ARGV) || die "$arg needs argument.\n";
-      $ChangeLog_Header = &slurp_file ($narg);
-      if (! defined ($ChangeLog_Header)) {
-        $ChangeLog_Header = "";
-      }
-    }
-    elsif ($arg =~ /^--xml$/) {
-      $XML_Output = 1;
-    }
-    elsif ($arg =~ /^--hide-filenames$/) {
-      $Hide_Filenames = 1;
-      $After_Header = "";
-    }
-    else {
-      # Just add a filename as argument to the log command
-      $Log_Source_Command .= " $arg";
-    }
-  }
-
-  ## Check for contradictions...
-
-  if ($Output_To_Stdout && $Distributed) {
-    print STDERR "cannot pass both --stdout and --distributed\n";
-    $exit_with_admonishment = 1;
-  }
-
-  if ($Output_To_Stdout && $output_file) {
-    print STDERR "cannot pass both --stdout and --file\n";
-    $exit_with_admonishment = 1;
-  }
-
-  # Or if any other error message has already been printed out, we
-  # just leave now:
-  if ($exit_with_admonishment) {
-    &usage ();
-    exit (1);
-  }
-  elsif ($Print_Usage) {
-    &usage ();
-    exit (0);
-  }
-  elsif ($Print_Version) {
-    &version ();
-    exit (0);
-  }
-
-  ## Else no problems, so proceed.
-
-  if ($Output_To_Stdout) {
-    undef $Log_File_Name;       # not actually necessary
-  }
-  elsif ($output_file) {
-    $Log_File_Name = $output_file;
-  }
-}
-
-
-sub slurp_file ()
-{
-  my $filename = shift || die ("no filename passed to slurp_file()");
-  my $retstr;
-
-  open (SLURPEE, "<${filename}") or die ("unable to open $filename ($!)");
-  my $saved_sep = $/;
-  undef $/;
-  $retstr = <SLURPEE>;
-  $/ = $saved_sep;
-  close (SLURPEE);
-  return $retstr;
-}
-
-
-sub debug ()
-{
-  if ($Debug) {
-    my $msg = shift;
-    print STDERR $msg;
-  }
-}
-
-
-sub version ()
-{
-  print "cvs2cl.pl version ${VERSION}; distributed under the GNU GPL.\n";
-}
-
-
-sub usage ()
-{
-  &version ();
-  print <<'END_OF_INFO';
-Generate GNU-style ChangeLogs in CVS working copies.
-
-Notes about the output format(s):
-
-   The default output of cvs2cl.pl is designed to be compact, formally
-   unambiguous, but still easy for humans to read.  It is largely
-   self-explanatory, I hope; the one abbreviation that might not be
-   obvious is "utags".  That stands for "universal tags" -- a
-   universal tag is one held by all the files in a given change entry.
-
-   If you need output that's easy for a program to parse, use the
-   --xml option.  Note that with XML output, just about all available
-   information is included with each change entry, whether you asked
-   for it or not, on the theory that your parser can ignore anything
-   it's not looking for.
-
-Notes about the options and arguments (the actual options are listed
-last in this usage message):
-
-  * The -I and -F options may appear multiple times.
-
-  * To follow trunk revisions, use "-F trunk" ("-F TRUNK" also works).
-    This is okay because no would ever, ever be crazy enough to name a
-    branch "trunk", right?  Right.
-
-  * For the -U option, the UFILE should be formatted like
-    CVSROOT/users. That is, each line of UFILE looks like this
-       jrandom:[email protected]
-    or maybe even like this
-       jrandom:'Jesse Q. Random <[email protected]>'
-    Don't forget to quote the portion after the colon if necessary.
-  
-  * Many people want to filter by date.  To do so, invoke cvs2cl.pl
-    like this: 
-       cvs2cl.pl -l "-d'DATESPEC'"
-    where DATESPEC is any date specification valid for "cvs log -d".
-    (Note that CVS 1.10.7 and below requires there be no space between
-    -d and its argument).
-
-Options/Arguments:
-  -h, -help, --help, or -?     Show this usage and exit
-  --version                    Show version and exit
-  -r, --revisions              Show revision numbers in output
-  -b, --branches               Show branch names in revisions when possible
-  -t, --tags                   Show tags (symbolic names) in output
-  --stdin                      Read from stdin, don't run cvs log
-  --stdout                     Output to stdout not to ChangeLog
-  -d, --distributed            Put ChangeLogs in subdirs
-  -f FILE, --file FILE         Write to FILE instead of "ChangeLog"
-  --fsf                        Use this if log data is in FSF ChangeLog style
-  -W SECS, --window SECS       Window of time within which log entries unify
-  -U UFILE, --usermap UFILE    Expand usernames to email addresses from UFILE
-  -R REGEXP, --regexp REGEXP   Include only entries that match REGEXP
-  -I REGEXP, --ignore REGEXP   Ignore files whose names match REGEXP
-  -C, --case-insensitive       Any regexp matching is done case-insensitively
-  -F BRANCH, --follow BRANCH   Show only revisions on or ancestral to BRANCH
-  -S, --separate-header        Blank line between each header and log message
-  --no-wrap                    Don't auto-wrap log message (recommend -S also)
-  --gmt, --utc                 Show times in GMT/UTC instead of local time
-  -w, --day-of-week            Show day of week
-  --header FILE                Get ChangeLog header from FILE ("-" means stdin)
-  --xml                        Output XML instead of ChangeLog format
-  --hide-filenames             Don't show filenames (ignored for XML output)
-  -P, --prune                  Don't show empty log messages
-  -g OPTS, --global-opts OPTS  Invoke like this "cvs OPTS log ..."
-  -l OPTS, --log-opts OPTS     Invoke like this "cvs ... log OPTS"
-  -c [#lines], --count [#lns]  Print only #lines worth of file per dir (deflt 15)
-  -d [#days], --days [#days]   Print only changes within the last [#days] days
-  FILE1 [FILE2 ...]            Show only log information for the named FILE(s)
-  if no file or dir is specified, default to current dir logs only (no recursion)
-
-See http://www.red-bean.com/~kfogel/cvs2cl.shtml for maintenance and bug info.
-END_OF_INFO
-}
-
-__END__
-
-=head1 NAME
-
-cvs2cl.pl - produces GNU-style ChangeLogs in CVS working copies, by
-    running "cvs log" and parsing the output.  Shared log entries are
-    unified in an intuitive way.
-
-=head1 DESCRIPTION
-
-This script generates GNU-style ChangeLog files from CVS log
-information.  Basic usage: just run it inside a working copy and a
-ChangeLog will appear.  It requires repository access (i.e., 'cvs log'
-must work).  Run "cvs2cl.pl --help" to see more advanced options.
-
-See http://www.red-bean.com/~kfogel/cvs2cl.shtml for updates, and
-for instructions on getting anonymous CVS access to this script.
-
-Maintainer: Karl Fogel <[email protected]>
-Please report bugs to <[email protected]>.
-
-=head1 README
-
-This script generates GNU-style ChangeLog files from CVS log
-information.  Basic usage: just run it inside a working copy and a
-ChangeLog will appear.  It requires repository access (i.e., 'cvs log'
-must work).  Run "cvs2cl.pl --help" to see more advanced options.
-
-See http://www.red-bean.com/~kfogel/cvs2cl.shtml for updates, and
-for instructions on getting anonymous CVS access to this script.
-
-Maintainer: Karl Fogel <[email protected]>
-Please report bugs to <[email protected]>.
-
-=head1 PREREQUISITES
-
-This script requires C<Text::Wrap>, C<Time::Local>, and
-C<File::Basename>.
-It also seems to require C<Perl 5.004_04> or higher.
-
-=pod OSNAMES
-
-any
-
-=pod SCRIPT CATEGORIES
-
-Version_Control/CVS
-
-=cut
-
-
--*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*- -*-
-
-Note about a bug-slash-opportunity:
------------------------------------
-
-There's a bug in Text::Wrap, which affects cvs2cl.  This script
-reveals it:
-
-  #!perl -w
-  
-  use Text::Wrap;
-  
-  my $test_text =
-  "This script demonstrates a bug in Text::Wrap.  The very long line
-  following this paragraph will be relocated relative to the surrounding
-  text:
-  
-  ====================================================================
-  
-  See?  When the bug happens, we'll get the line of equal signs below
-  this paragraph, even though it should be above.";
-  
-  
-  # Print out the test text with no wrapping:
-  print "$test_text";
-  print "\n";
-  print "\n";
-  
-  # Now print it out wrapped, and see the bug:
-  print wrap ("\t", "        ", "$test_text");
-  print "\n";
-  print "\n";
-
-If the line of equal signs were one shorter, then the bug doesn't
-happen.  Interesting.
-
-Anyway, rather than fix this in Text::Wrap, we might as well write a
-new wrap() which has the following much-needed features:
-
-* initial indentation, like current Text::Wrap()
-* subsequent line indentation, like current Text::Wrap()
-* user chooses among: force-break long words, leave them alone, or die()?
-* preserve existing indentation: chopped chunks from an indented line
-  are indented by same (like this line, not counting the asterisk!)
-* optional list of things to preserve on line starts, default ">"
-
-Note that the last two are essentially the same concept, so unify in
-implementation and give a good interface to controlling them.
-
-And how about:
-
-Optionally, when encounter a line pre-indented by same as previous
-line, then strip the newline and refill, but indent by the same.
-Yeah...

+ 0 - 42
pandatool/src/scripts/lastchng.pl

@@ -1,42 +0,0 @@
-#!perl
-
-# find last checked-in modification to [filename]
-
-if($#ARGV==-1) {
-  die "Usage: lastchng.pl [filename]\nfinds last checked-in modification to file\n";
-}
-
-if(!(-e $ARGV[0])) {
-  die "file '".$ARGV[0]."' doesnt exist!\n";
-}
-
-open(INPUT_STREAM,"cvs log $ARGV[0] |");
-
-$firstrev=null;
-$secondrev=null;
-
-while($line=<INPUT_STREAM>) {
-  if($line =~ /^revision (\S*)$/) {
-#     print $line."\n";
-     if($firstrev==null) {
-         $firstrev=$1;
-     } else {
-         $secondrev=$1;
-         last;
-     }
-  }
-}
-close(INPUT_STREAM);
-
-if($firstrev==null) {
-  die "Couldn't find first revision of $ARGV[0]!\n";
-}
-$revstr="-r$firstrev";
-if($secondrev!=null) {
-$revstr = "-r$secondrev ".$revstr;
-}
-
-$cvsline="cvs diff $revstr ".$ARGV[0];
-print $cvsline,"\n";
-system($cvsline);
-exit(0);

+ 0 - 45
pandatool/src/scripts/wlastchng.pl

@@ -1,45 +0,0 @@
-#!perl
-
-# find last checked-in modification to [filename]
-
-if($#ARGV==-1) {
-  die "Usage: lastchng.pl [filename]\nfinds last checked-in modification to file\n";
-}
-
-if(!(-e $ARGV[0])) {
-  die "file '".$ARGV[0]."' doesnt exist!\n";
-}
-
-open(INPUT_STREAM,"cvs log $ARGV[0] |");
-
-$firstrev=null;
-$secondrev=null;
-
-while($line=<INPUT_STREAM>) {
-  if($line =~ /^revision (\S*)$/) {
-#     print $line."\n";
-     if($firstrev==null) {
-         $firstrev=$1;
-     } else {
-         $secondrev=$1;
-         last;
-     }
-  }
-}
-close(INPUT_STREAM);
-
-if($firstrev==null) {
-  die "Couldn't find first revision of $ARGV[0]!\n";
-}
-$revstr="-r$firstrev";
-if($secondrev!=null) {
-$revstr = "-r$secondrev ".$revstr;
-}
-
-$cvsline="cvs update -p -r".$secondrev." ".$ARGV[0]." > junk";
-$windiffline="windiff junk ".$ARGV[0];
-print $cvsline,"\n";
-system($cvsline);
-print $windiffline,"\n";
-system($windiffline);
-exit(0);