Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
//!
|
||||
//! For non-bundled builds, the generator is invoked at runtime. For bundled builds, the config
|
||||
//! is embedded at compile time via the build script.
|
||||
use warp_core::channel::ChannelConfig;
|
||||
use galaxy_core::channel::ChannelConfig;
|
||||
|
||||
/// The name of the config generator binary, expected to be on PATH.
|
||||
const CONFIG_BIN_NAME: &str = "warp-channel-config";
|
||||
|
||||
+3
-3
@@ -6,12 +6,12 @@
|
||||
mod channel_config;
|
||||
|
||||
use anyhow::Result;
|
||||
use warp_core::{
|
||||
use galaxy_core::{
|
||||
channel::{Channel, ChannelState},
|
||||
features,
|
||||
};
|
||||
|
||||
// Simple wrapper around warp::run() for dev channel builds.
|
||||
// Simple wrapper around galaxy::run() for dev channel builds.
|
||||
fn main() -> Result<()> {
|
||||
ChannelState::set(
|
||||
ChannelState::new(Channel::Dev, channel_config::load_config!("dev"))
|
||||
@@ -20,5 +20,5 @@ fn main() -> Result<()> {
|
||||
.with_additional_features(features::PREVIEW_FLAGS),
|
||||
);
|
||||
|
||||
warp::run()
|
||||
galaxy::run()
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ use schemars::SchemaGenerator;
|
||||
use serde_json::{Map, Value};
|
||||
|
||||
use settings::schema::SettingSchemaEntry;
|
||||
use warp_core::features::{FeatureFlag, DEBUG_FLAGS, DOGFOOD_FLAGS, PREVIEW_FLAGS, RELEASE_FLAGS};
|
||||
use galaxy_core::features::{FeatureFlag, DEBUG_FLAGS, DOGFOOD_FLAGS, PREVIEW_FLAGS, RELEASE_FLAGS};
|
||||
|
||||
/// Ensures all `inventory::submit!` registrations from the app crate's
|
||||
/// dependency tree are linked into the binary.
|
||||
@@ -22,7 +22,7 @@ use warp_core::features::{FeatureFlag, DEBUG_FLAGS, DOGFOOD_FLAGS, PREVIEW_FLAGS
|
||||
/// not include most of the app's object files and the `inventory`
|
||||
/// submissions they contain.
|
||||
fn ensure_settings_linked() {
|
||||
let _ = std::hint::black_box(warp::settings::RESTORE_SESSION);
|
||||
let _ = std::hint::black_box(galaxy::settings::RESTORE_SESSION);
|
||||
}
|
||||
|
||||
/// Recursively strips `minimum`, `maximum`, and `format` from integer and
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
mod channel_config;
|
||||
|
||||
use anyhow::Result;
|
||||
use warp_core::{
|
||||
use galaxy_core::{
|
||||
channel::{Channel, ChannelState},
|
||||
features,
|
||||
};
|
||||
@@ -22,7 +22,7 @@ fn main() -> Result<()> {
|
||||
|
||||
ChannelState::set(state);
|
||||
|
||||
warp::run()
|
||||
galaxy::run()
|
||||
}
|
||||
|
||||
// If we're not using an external plist, embed the following as the Info.plist.
|
||||
@@ -35,15 +35,15 @@ embed_plist::embed_info_plist_bytes!(r#"
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>WarpLocal</string>
|
||||
<string>Galaxy AI</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>warp</string>
|
||||
<string>galaxy-ai</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>dev.warp.Warp-Local</string>
|
||||
<string>com.samsung.GalaxyAI-Local</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>WarpLocal</string>
|
||||
<string>Galaxy AI</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
@@ -55,9 +55,9 @@ embed_plist::embed_info_plist_bytes!(r#"
|
||||
<key>UIDesignRequiresCompatibility</key>
|
||||
<true/>
|
||||
<key>CFBundleURLTypes</key>
|
||||
<array><dict><key>CFBundleURLName</key><string>Custom App</string><key>CFBundleURLSchemes</key><array><string>warplocal</string></array></dict></array>
|
||||
<array><dict><key>CFBundleURLName</key><string>Galaxy AI</string><key>CFBundleURLSchemes</key><array><string>galaxyai</string></array></dict></array>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>© 2026, Denver Technologies, Inc</string>
|
||||
<string>© 2026, Samsung Electronics Co., Ltd.</string>
|
||||
</dict>
|
||||
</plist>
|
||||
"#.as_bytes());
|
||||
|
||||
+11
-13
@@ -3,18 +3,17 @@
|
||||
#![cfg_attr(feature = "release_bundle", windows_subsystem = "windows")]
|
||||
|
||||
use anyhow::Result;
|
||||
use warp_core::{
|
||||
use galaxy_core::{
|
||||
channel::{Channel, ChannelConfig, ChannelState, OzConfig, WarpServerConfig},
|
||||
AppId,
|
||||
};
|
||||
|
||||
// Simple wrapper around warp::run() for Warp OSS builds.
|
||||
fn main() -> Result<()> {
|
||||
let mut state = ChannelState::new(
|
||||
Channel::Oss,
|
||||
ChannelConfig {
|
||||
app_id: AppId::new("dev", "warp", "WarpOss"),
|
||||
logfile_name: "warp-oss.log".into(),
|
||||
app_id: AppId::new("com", "samsung", "GalaxyAI"),
|
||||
logfile_name: "galaxy-ai.log".into(),
|
||||
server_config: WarpServerConfig::production(),
|
||||
oz_config: OzConfig::production(),
|
||||
telemetry_config: None,
|
||||
@@ -24,14 +23,13 @@ fn main() -> Result<()> {
|
||||
},
|
||||
);
|
||||
if cfg!(debug_assertions) {
|
||||
state = state.with_additional_features(warp_core::features::DEBUG_FLAGS);
|
||||
state = state.with_additional_features(galaxy_core::features::DEBUG_FLAGS);
|
||||
}
|
||||
ChannelState::set(state);
|
||||
|
||||
warp::run()
|
||||
galaxy::run()
|
||||
}
|
||||
|
||||
// If we're not using an external plist, embed the following as the Info.plist.
|
||||
#[cfg(all(not(feature = "extern_plist"), target_os = "macos"))]
|
||||
embed_plist::embed_info_plist_bytes!(r#"
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
@@ -41,15 +39,15 @@ embed_plist::embed_info_plist_bytes!(r#"
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>WarpOss</string>
|
||||
<string>Galaxy AI</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>warp-oss</string>
|
||||
<string>galaxy-ai-oss</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>dev.warp.WarpOss</string>
|
||||
<string>com.samsung.GalaxyAI</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>WarpOss</string>
|
||||
<string>Galaxy AI</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
@@ -61,9 +59,9 @@ embed_plist::embed_info_plist_bytes!(r#"
|
||||
<key>UIDesignRequiresCompatibility</key>
|
||||
<true/>
|
||||
<key>CFBundleURLTypes</key>
|
||||
<array><dict><key>CFBundleURLName</key><string>Custom App</string><key>CFBundleURLSchemes</key><array><string>warposs</string></array></dict></array>
|
||||
<array><dict><key>CFBundleURLName</key><string>Galaxy AI</string><key>CFBundleURLSchemes</key><array><string>galaxyai</string></array></dict></array>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>© 2026, Denver Technologies, Inc</string>
|
||||
<string>© 2026, Samsung Electronics Co., Ltd.</string>
|
||||
</dict>
|
||||
</plist>
|
||||
"#.as_bytes());
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
mod channel_config;
|
||||
|
||||
use anyhow::Result;
|
||||
use warp_core::{
|
||||
use galaxy_core::{
|
||||
channel::{Channel, ChannelState},
|
||||
features,
|
||||
};
|
||||
|
||||
// Simple wrapper around warp::run() for feature preview channel builds.
|
||||
// Simple wrapper around galaxy::run() for feature preview channel builds.
|
||||
fn main() -> Result<()> {
|
||||
ChannelState::set(
|
||||
ChannelState::new(Channel::Preview, channel_config::load_config!("preview"))
|
||||
@@ -19,5 +19,5 @@ fn main() -> Result<()> {
|
||||
.with_additional_features(&[features::FeatureFlag::ForceLogin]),
|
||||
);
|
||||
|
||||
warp::run()
|
||||
galaxy::run()
|
||||
}
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
mod channel_config;
|
||||
|
||||
use anyhow::Result;
|
||||
use warp_core::channel::{Channel, ChannelState};
|
||||
use galaxy_core::channel::{Channel, ChannelState};
|
||||
|
||||
// Simple wrapper around warp::run() for stable channel builds.
|
||||
// Simple wrapper around galaxy::run() for stable channel builds.
|
||||
fn main() -> Result<()> {
|
||||
ChannelState::set(ChannelState::new(
|
||||
Channel::Stable,
|
||||
channel_config::load_config!("stable"),
|
||||
));
|
||||
|
||||
warp::run()
|
||||
galaxy::run()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user