This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 179934
Collapse All | Expand All

(-)a/core.startup/src/org/netbeans/core/startup/CoreBridge.java (-1 / +7 lines)
Lines 184-188 Link Here
184
            provides.add("org.openide.modules.os.Solaris"); // NOI18N
184
            provides.add("org.openide.modules.os.Solaris"); // NOI18N
185
        }
185
        }
186
    }
186
    }
187
    
187
188
    public static void defineArchTokens(Collection<? super String> provides) {
189
        String arch = System.getProperty("os.arch"); // NOI18N
190
        if (arch != null && !arch.isEmpty()) {
191
            provides.add("org.openide.modules.arch." + arch); // NOI18N
192
        }
193
    }
188
}
194
}
(-)a/core.startup/src/org/netbeans/core/startup/NbInstaller.java (+1 lines)
Lines 779-784 Link Here
779
        if (m.getCodeNameBase ().equals ("org.openide.modules")) { // NOI18N
779
        if (m.getCodeNameBase ().equals ("org.openide.modules")) { // NOI18N
780
            List<String> arr = new ArrayList<String>(4);
780
            List<String> arr = new ArrayList<String>(4);
781
            CoreBridge.defineOsTokens(arr);
781
            CoreBridge.defineOsTokens(arr);
782
            CoreBridge.defineArchTokens(arr);
782
            
783
            
783
            // module format is now 2
784
            // module format is now 2
784
            arr.add("org.openide.modules.ModuleFormat1"); // NOI18N
785
            arr.add("org.openide.modules.ModuleFormat1"); // NOI18N

Return to bug 179934